aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--admin/debootstrap/Makefile2
-rw-r--r--lang/python/files/python-host.mk13
-rw-r--r--lang/python3/files/python3-package.mk11
-rw-r--r--libs/libjpeg/Makefile1
-rw-r--r--libs/tiff/Makefile1
-rw-r--r--mail/ssmtp/Makefile2
-rw-r--r--net/bind/Makefile4
-rw-r--r--net/bind/patches/001-no-tests.patch20
-rw-r--r--net/bind/patches/002-autoconf-ar-fix.patch8
-rw-r--r--net/strongswan/patches/101-musl-fixes.patch7
-rw-r--r--utils/gptfdisk/Makefile2
-rw-r--r--utils/hd-idle/Makefile2
-rw-r--r--utils/hdparm/Makefile2
-rw-r--r--utils/i2c-tools/Makefile32
-rw-r--r--utils/lvm2/Makefile2
-rw-r--r--utils/rng-tools/Makefile6
-rw-r--r--utils/rng-tools/files/rngd.init16
-rw-r--r--utils/rng-tools/files/rngd.uci_defaults8
-rw-r--r--utils/zoneinfo/Makefile2
19 files changed, 99 insertions, 42 deletions
diff --git a/admin/debootstrap/Makefile b/admin/debootstrap/Makefile
index eef7bf2e1..a7d45c264 100644
--- a/admin/debootstrap/Makefile
+++ b/admin/debootstrap/Makefile
@@ -28,7 +28,7 @@ define Package/debootstrap
CATEGORY:=Administration
TITLE:=Bootstrap a basic Debian system
URL:=http://wiki.debian.org/Debootstrap
- DEPENDS:= +coreutils +coreutils-chroot +coreutils-sha1sum +ar
+ DEPENDS:= +coreutils +coreutils-chroot +coreutils-sha1sum +ar +xz
endef
define Package/debootstrap/description
diff --git a/lang/python/files/python-host.mk b/lang/python/files/python-host.mk
index 5b74d1006..0a5eb4193 100644
--- a/lang/python/files/python-host.mk
+++ b/lang/python/files/python-host.mk
@@ -5,10 +5,13 @@
# See /LICENSE for more information.
#
-# For HOST_BUILD_PREFIX
-include $(INCLUDE_DIR)/host-build.mk
+# Compatibility fallback for older OpenWrt and LEDE versions
+ifeq ($(STAGING_DIR_HOSTPKG),)
+ $(warning STAGING_DIR_HOSTPKG is unset - falling back to $$(STAGING_DIR)/host)
+ STAGING_DIR_HOSTPKG := $(STAGING_DIR)/host
+endif
-HOST_PYTHON_DIR:=$(HOST_BUILD_PREFIX)
+HOST_PYTHON_DIR:=$(STAGING_DIR_HOSTPKG)
HOST_PYTHON_INC_DIR:=$(HOST_PYTHON_DIR)/include/python$(PYTHON_VERSION)
HOST_PYTHON_LIB_DIR:=$(HOST_PYTHON_DIR)/lib/python$(PYTHON_VERSION)
@@ -16,7 +19,7 @@ HOST_PYTHON_PKG_DIR:=/lib/python$(PYTHON_VERSION)/site-packages
HOST_PYTHON_BIN:=$(HOST_PYTHON_DIR)/bin/python$(PYTHON_VERSION)
-HOST_PYTHONPATH:=$(HOST_PYTHON_LIB_DIR):$(HOST_BUILD_PREFIX)/$(HOST_PYTHON_PKG_DIR)
+HOST_PYTHONPATH:=$(HOST_PYTHON_LIB_DIR):$(STAGING_DIR_HOSTPKG)/$(HOST_PYTHON_PKG_DIR)
define HostPython
if [ "$(strip $(3))" == "HOST" ]; then \
@@ -47,7 +50,7 @@ define Build/Compile/HostPyRunHost
LDSHARED="$(HOSTCC) -shared" \
CFLAGS="$(HOST_CFLAGS)" \
CPPFLAGS="$(HOST_CPPFLAGS) -I$(HOST_PYTHON_INC_DIR)" \
- LDFLAGS="$(HOST_LDFLAGS) -lpython$(PYTHON_VERSION) -Wl$(comma)-rpath=$(HOST_BUILD_PREFIX)/lib" \
+ LDFLAGS="$(HOST_LDFLAGS) -lpython$(PYTHON_VERSION) -Wl$(comma)-rpath=$(STAGING_DIR_HOSTPKG)/lib" \
_PYTHON_HOST_PLATFORM=linux2 \
$(3) \
, \
diff --git a/lang/python3/files/python3-package.mk b/lang/python3/files/python3-package.mk
index 3f8e24e5c..1a12d13dd 100644
--- a/lang/python3/files/python3-package.mk
+++ b/lang/python3/files/python3-package.mk
@@ -5,8 +5,11 @@
# See /LICENSE for more information.
#
-# For HOST_BUILD_PREFIX
-include $(INCLUDE_DIR)/host-build.mk
+# Compatibility fallback for older OpenWrt and LEDE versions
+ifeq ($(STAGING_DIR_HOSTPKG),)
+ $(warning STAGING_DIR_HOSTPKG is unset - falling back to $$(STAGING_DIR)/host)
+ STAGING_DIR_HOSTPKG := $(STAGING_DIR)/host
+endif
PYTHON3_VERSION_MAJOR:=3
PYTHON3_VERSION_MINOR:=5
@@ -23,8 +26,8 @@ PYTHON3_PKG_DIR:=/usr/lib/python$(PYTHON3_VERSION)/site-packages
PYTHON3:=python$(PYTHON3_VERSION)
-HOST_PYTHON3_LIB_DIR:=$(HOST_BUILD_PREFIX)/lib/python$(PYTHON3_VERSION)
-HOST_PYTHON3_BIN:=$(HOST_BUILD_PREFIX)/bin/python3
+HOST_PYTHON3_LIB_DIR:=$(STAGING_DIR_HOSTPKG)/lib/python$(PYTHON3_VERSION)
+HOST_PYTHON3_BIN:=$(STAGING_DIR_HOSTPKG)/bin/python3
PYTHON3PATH:=$(PYTHON3_LIB_DIR):$(STAGING_DIR)/$(PYTHON3_PKG_DIR):$(PKG_INSTALL_DIR)/$(PYTHON3_PKG_DIR)
define HostPython3
diff --git a/libs/libjpeg/Makefile b/libs/libjpeg/Makefile
index 2aa82221a..c88bca030 100644
--- a/libs/libjpeg/Makefile
+++ b/libs/libjpeg/Makefile
@@ -41,6 +41,7 @@ define Package/jpeg-tools
$(call Package/jpeg/Default)
SECTION:=utils
CATEGORY:=Utilities
+ SUBMENU:=Image Manipulation
DEPENDS:=+libjpeg
TITLE+= manipulation tools
endef
diff --git a/libs/tiff/Makefile b/libs/tiff/Makefile
index 6d83fe79a..7c8d18e6b 100644
--- a/libs/tiff/Makefile
+++ b/libs/tiff/Makefile
@@ -54,6 +54,7 @@ define Package/tiff-utils
$(call Package/tiff/Default)
SECTION:=utils
CATEGORY:=Utilities
+ SUBMENU:=Image Manipulation
TITLE+= utilities
DEPENDS:=+libtiff
endef
diff --git a/mail/ssmtp/Makefile b/mail/ssmtp/Makefile
index 064c14bc8..22db52a04 100644
--- a/mail/ssmtp/Makefile
+++ b/mail/ssmtp/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=ssmtp
PKG_VERSION:=2.64
-PKG_RELEASE:=3
+PKG_RELEASE:=5
PKG_MAINTAINER:=Dirk Brenken <dev@brenken.org>
PKG_LICENSE:=GPL-2.0+
diff --git a/net/bind/Makefile b/net/bind/Makefile
index e3bfb067d..0f1212ced 100644
--- a/net/bind/Makefile
+++ b/net/bind/Makefile
@@ -9,7 +9,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=bind
-PKG_VERSION:=9.9.9-P3
+PKG_VERSION:=9.10.4-P4
PKG_RELEASE:=1
USERID:=bind=57:bind=57
@@ -20,7 +20,7 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:= \
ftp://ftp.isc.org/isc/bind9/$(PKG_VERSION) \
http://www.mirrorservice.org/sites/ftp.isc.org/isc/bind9/$(PKG_VERSION)
-PKG_MD5SUM:=98d46cebb3fac3c6f282e8467424821b
+PKG_MD5SUM:=e110904a1d54f83f01d4be8bcd842927
PKG_FIXUP:=autoreconf
PKG_REMOVE_FILES:=aclocal.m4 libtool.m4
diff --git a/net/bind/patches/001-no-tests.patch b/net/bind/patches/001-no-tests.patch
index c969c5e96..321924b0c 100644
--- a/net/bind/patches/001-no-tests.patch
+++ b/net/bind/patches/001-no-tests.patch
@@ -1,26 +1,26 @@
-Index: bind-9.9.4/bin/Makefile.in
+Index: bind-9.10.4-P3/bin/Makefile.in
===================================================================
---- bind-9.9.4.orig/bin/Makefile.in
-+++ bind-9.9.4/bin/Makefile.in
+--- bind-9.10.4-P3.orig/bin/Makefile.in
++++ bind-9.10.4-P3/bin/Makefile.in
@@ -19,7 +19,7 @@ srcdir = @srcdir@
VPATH = @srcdir@
top_srcdir = @top_srcdir@
--SUBDIRS = named rndc dig dnssec tools tests nsupdate \
-+SUBDIRS = named rndc dig dnssec tools nsupdate \
+-SUBDIRS = named rndc dig delv dnssec tools tests nsupdate \
++SUBDIRS = named rndc dig delv dnssec tools nsupdate \
check confgen @PYTHON_TOOLS@ @PKCS11_TOOLS@
TARGETS =
-Index: bind-9.9.4/lib/Makefile.in
+Index: bind-9.10.4-P3/lib/Makefile.in
===================================================================
---- bind-9.9.4.orig/lib/Makefile.in
-+++ bind-9.9.4/lib/Makefile.in
+--- bind-9.10.4-P3.orig/lib/Makefile.in
++++ bind-9.10.4-P3/lib/Makefile.in
@@ -23,7 +23,7 @@ top_srcdir = @top_srcdir@
# Attempt to disable parallel processing.
.NOTPARALLEL:
.NO_PARALLEL:
--SUBDIRS = isc isccc dns isccfg bind9 lwres tests
-+SUBDIRS = isc isccc dns isccfg bind9 lwres
+-SUBDIRS = isc isccc dns isccfg bind9 lwres irs tests samples
++SUBDIRS = isc isccc dns isccfg bind9 lwres irs samples
TARGETS =
@BIND9_MAKE_RULES@
diff --git a/net/bind/patches/002-autoconf-ar-fix.patch b/net/bind/patches/002-autoconf-ar-fix.patch
index 501fa7d3b..c36026034 100644
--- a/net/bind/patches/002-autoconf-ar-fix.patch
+++ b/net/bind/patches/002-autoconf-ar-fix.patch
@@ -1,6 +1,8 @@
---- a/configure.in
-+++ b/configure.in
-@@ -93,26 +93,11 @@ esac
+Index: bind-9.10.4-P3/configure.in
+===================================================================
+--- bind-9.10.4-P3.orig/configure.in
++++ bind-9.10.4-P3/configure.in
+@@ -167,26 +167,11 @@ esac
#
AC_CONFIG_FILES([make/rules make/includes])
diff --git a/net/strongswan/patches/101-musl-fixes.patch b/net/strongswan/patches/101-musl-fixes.patch
index ff7afa4ed..cbb6c047d 100644
--- a/net/strongswan/patches/101-musl-fixes.patch
+++ b/net/strongswan/patches/101-musl-fixes.patch
@@ -52,15 +52,14 @@
+#undef encrypt
--- a/src/libcharon/plugins/kernel_netlink/kernel_netlink_ipsec.c
+++ b/src/libcharon/plugins/kernel_netlink/kernel_netlink_ipsec.c
-@@ -18,6 +18,8 @@
- * for more details.
+@@ -19,6 +19,7 @@
*/
-+#include <musl.h>
-+
#define _GNU_SOURCE
++#include <musl.h>
#include <sys/types.h>
#include <sys/socket.h>
+ #include <stdint.h>
--- a/src/libcharon/plugins/kernel_netlink/kernel_netlink_net.c
+++ b/src/libcharon/plugins/kernel_netlink/kernel_netlink_net.c
@@ -37,6 +37,8 @@
diff --git a/utils/gptfdisk/Makefile b/utils/gptfdisk/Makefile
index 900a9dc38..3ce5a6973 100644
--- a/utils/gptfdisk/Makefile
+++ b/utils/gptfdisk/Makefile
@@ -21,7 +21,7 @@ include $(INCLUDE_DIR)/package.mk
define Package/gptfdisk/default
SECTION:=utils
CATEGORY:=Utilities
- SUBMENU:=disc
+ SUBMENU:=Disc
URL:=http://www.rodsbooks.com/gdisk
MAINTAINER:=Daniel Engberg <daniel.engberg.lists@pyret.net>
endef
diff --git a/utils/hd-idle/Makefile b/utils/hd-idle/Makefile
index 7bf0053e5..a0c9cca4a 100644
--- a/utils/hd-idle/Makefile
+++ b/utils/hd-idle/Makefile
@@ -27,7 +27,7 @@ define Package/hd-idle
SECTION:=utils
CATEGORY:=Utilities
TITLE:=Another idle-daemon for attached hard drives
- SUBMENU:=disc
+ SUBMENU:=Disc
URL:=http://hd-idle.sourceforge.net/
endef
diff --git a/utils/hdparm/Makefile b/utils/hdparm/Makefile
index fabc46439..9de3da9ac 100644
--- a/utils/hdparm/Makefile
+++ b/utils/hdparm/Makefile
@@ -25,7 +25,7 @@ TARGET_CFLAGS+=-D_GNU_SOURCE
define Package/hdparm
SECTION:=utils
CATEGORY:=Utilities
- SUBMENU:=disc
+ SUBMENU:=Disc
TITLE:=Hard disk drive configuration utilitity
URL:=http://sourceforge.net/projects/hdparm/
endef
diff --git a/utils/i2c-tools/Makefile b/utils/i2c-tools/Makefile
index c66c80ea8..4fb9b50f5 100644
--- a/utils/i2c-tools/Makefile
+++ b/utils/i2c-tools/Makefile
@@ -26,6 +26,7 @@ PKG_LICENSE_FILES:=COPYING
include $(INCLUDE_DIR)/package.mk
$(call include_mk, python-package.mk)
+$(call include_mk, python3-package.mk)
define Package/i2c/Default
URL:=http://lm-sensors.org/wiki/I2CTools
@@ -48,6 +49,15 @@ define Package/python-smbus
DEPENDS:=+python-light
endef
+define Package/python3-smbus
+ $(call Package/i2c/Default)
+ SUBMENU:=Python
+ SECTION:=lang
+ CATEGORY:=Languages
+ TITLE:=Python bindings for the SMBUS
+ DEPENDS:=+python3-light
+endef
+
define Package/i2c-tools/description
This package contains an heterogeneous set of I2C tools for Linux. These tools
were originally part of the lm-sensors package.
@@ -57,6 +67,10 @@ define Package/python-smbus/description
This package contain the python bindings for Linux SMBus access through i2c-dev.
endef
+define Package/python3-smbus/description
+ This package contain the python bindings for Linux SMBus access through i2c-dev.
+endef
+
TARGET_CPPFLAGS += -I$(PKG_BUILD_DIR)/include
ifdef CONFIG_PACKAGE_python-smbus
@@ -68,6 +82,15 @@ ifdef CONFIG_PACKAGE_python-smbus
endef
endif
+ifdef CONFIG_PACKAGE_python3-smbus
+ define Build/Compile/python3-smbus
+ $(if $(Build/Compile/Py3Mod),,@echo Python3 packaging code not found.; false)
+ $(call Build/Compile/Py3Mod,./py-smbus/, \
+ install --prefix="$(PKG_INSTALL_DIR)/usr", \
+ )
+ endef
+endif
+
define Build/Compile
$(MAKE) -C $(PKG_BUILD_DIR) \
LINUX="$(LINUX_DIR)" \
@@ -76,6 +99,7 @@ define Build/Compile
LDFLAGS="$(TARGET_LDFLAGS)" \
CFLAGS="$(TARGET_CFLAGS)"
$(Build/Compile/python-smbus)
+ $(Build/Compile/python3-smbus)
endef
define Package/i2c-tools/install
@@ -87,9 +111,15 @@ define Package/i2c-tools/install
endef
define PyPackage/python-smbus/filespec
-+|$(PYTHON_PKG_DIR)/smbus.so
++|$(PYTHON_PKG_DIR)
+endef
+
+define PyPackage/python3-smbus/filespec
++|$(PYTHON3_PKG_DIR)
endef
$(eval $(call BuildPackage,i2c-tools))
$(eval $(call PyPackage,python-smbus))
$(eval $(call BuildPackage,python-smbus))
+$(eval $(call PyPackage,python3-smbus))
+$(eval $(call BuildPackage,python3-smbus))
diff --git a/utils/lvm2/Makefile b/utils/lvm2/Makefile
index 024143a5f..928050a9f 100644
--- a/utils/lvm2/Makefile
+++ b/utils/lvm2/Makefile
@@ -37,7 +37,7 @@ endef
define Package/lvm2
SECTION:=utils
CATEGORY:=Utilities
- SUBMENU:=disc
+ SUBMENU:=Disc
TITLE:=The Linux Logical Volume Manager
URL:=http://sourceware.org/lvm2/
DEPENDS:=+libdevmapper +libblkid +libreadline +libncurses
diff --git a/utils/rng-tools/Makefile b/utils/rng-tools/Makefile
index b97cbf2ae..0aad15b52 100644
--- a/utils/rng-tools/Makefile
+++ b/utils/rng-tools/Makefile
@@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=rng-tools
PKG_VERSION:=5
-PKG_RELEASE:=3
+PKG_RELEASE:=4
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=@SF/gkernel/rng-tools/$(PKG_VERSION)/
PKG_MD5SUM:=6726cdc6fae1f5122463f24ae980dd68
PKG_LICENSE:=GPLv2
-PKG_MAINTAINER:=Hannu Nyman <hannu.nyman@iki.fi>
+PKG_MAINTAINER:=Nathaniel Wesley Filardo <nwfilardo@gmail.com>
PKG_FIXUP:=autoreconf
@@ -52,6 +52,8 @@ CONFIGURE_ARGS += \
define Package/rng-tools/install
$(INSTALL_DIR) $(1)/etc/init.d
$(INSTALL_BIN) ./files/rngd.init $(1)/etc/init.d/rngd
+ $(INSTALL_DIR) $(1)/etc/uci_defaults
+ $(INSTALL_BIN) ./files/rngd.uci_defaults $(1)/etc/uci_defaults/rngd
$(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/rngtest $(1)/usr/bin/
$(INSTALL_DIR) $(1)/sbin
diff --git a/utils/rng-tools/files/rngd.init b/utils/rng-tools/files/rngd.init
index e9fba9097..e18288e53 100644
--- a/utils/rng-tools/files/rngd.init
+++ b/utils/rng-tools/files/rngd.init
@@ -3,12 +3,20 @@
START=98
-RNGD_AMOUNT=4000
-RNGD_DEVICE="/dev/urandom"
-# Use /dev/urandom as source, as hardware sources like /dev/hwrng are usually not present
+RNGD_FILLWATER=$(uci -q get system.@rngd[0].fill_watermark)
+RNGD_DEVICE=$(uci -q get system.@rngd[0].device)
+RNGD_ENABLED=$(uci -q get system.@rngd[0].enabled)
+RNGD_PRECMD=$(uci -q get system.@rngd[0].precmd)
+
+: ${RNGD_FILLWATER:=4000}
+
+echo PRECMD=\'$RNGD_PRECMD\'
start() {
- service_start /sbin/rngd -r $RNGD_DEVICE -W $RNGD_AMOUNT
+ [ 1 -eq "$RNGD_ENABLED" ] && {
+ [ -z "${RNGD_PRECMD}" ] || ${RNGD_PRECMD} ${RNGD_DEVICE}
+ service_start /sbin/rngd -r ${RNGD_DEVICE} -W ${RNGD_FILLWATER}
+ }
}
stop() {
diff --git a/utils/rng-tools/files/rngd.uci_defaults b/utils/rng-tools/files/rngd.uci_defaults
new file mode 100644
index 000000000..6a26cf0a1
--- /dev/null
+++ b/utils/rng-tools/files/rngd.uci_defaults
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+uci -q show system.@rngd[0] || {
+ uci add system rngd
+ uci set system.@rngd[0].enabled=0
+ uci set system.@rngd[0].device=/dev/urandom
+ uci commit
+}
diff --git a/utils/zoneinfo/Makefile b/utils/zoneinfo/Makefile
index 45ee8fddd..597ea0c7c 100644
--- a/utils/zoneinfo/Makefile
+++ b/utils/zoneinfo/Makefile
@@ -33,7 +33,7 @@ endef
$(eval $(call Download,tzcode))
define Package/zoneinfo/Default
- SUBMENU:=zoneinfo
+ SUBMENU:=Zoneinfo
TITLE:=Zone Information
SECTION:=utils
CATEGORY:=Utilities
Powered by cgit, Themed by Ted Yin.