Merge pull request #462 from bk138/gcc-workaround-sys-sdt-h-detection

gcc: work around wrongly detected sys/sdt.h header.

diff --git a/lang/micropython/Makefile b/lang/micropython/Makefile
index e73ca7afc2dd1df38b9a00cdc0e15ffc2a1dbcc4..6d8f5268ad64eab0da6e8393a3323275988385e1 100644 (file)
--- a/lang/micropython/Makefile
+++ b/lang/micropython/Makefile
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=micropython
-PKG_VERSION=1.3.3-20141006-$(PKG_SOURCE_VERSION)
+PKG_VERSION=1.3.4-20141022-$(PKG_SOURCE_VERSION)
 PKG_RELEASE:=1
 
 PKG_MAINTAINER:=Roger D <rogerdammit@gmail.com>
@@ -17,7 +17,7 @@ PKG_LICENSE_FILES:=LICENSE
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/micropython/micropython.git
-PKG_SOURCE_VERSION:=67f25dfe6f4b13a3b8d40746d2b2fd720c63caed
+PKG_SOURCE_VERSION:=3e42570538b46d680e796136ff441ae7b8a8fac5
 
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.gz

diff --git a/lang/python/files/python-package.mk b/lang/python/files/python-package.mk
index f5ec5cee9ed216ebc5ef0633b2c4e5814241b549..ecf48d1e3efce6453732cb809f95bb6b88d39cc2 100644 (file)
--- a/lang/python/files/python-package.mk
+++ b/lang/python/files/python-package.mk
@@ -33,7 +33,7 @@ define PyPackage
 
   define Package/$(1)/install
        find $(PKG_INSTALL_DIR) -name "*\.pyc" -o -name "*\.pyo" | xargs rm -f
-       @$(SH_FUNC) getvar $$(call shvar,PyPackage/$(1)/filespec) | ( \
+       @echo "$$$$$$$$$$(call shvar,PyPackage/$(1)/filespec)" | ( \
                IFS='|'; \
                while read fop fspec fperm; do \
                  if [ "$$$$$$$$fop" = "+" ]; then \

diff --git a/lang/python3/files/python3-package.mk b/lang/python3/files/python3-package.mk
index e2e71d3e0926959b2f3d1e12401caba55b3f4c8c..0c4057c7de230dc493dd57e895090fec36730a28 100644 (file)
--- a/lang/python3/files/python3-package.mk
+++ b/lang/python3/files/python3-package.mk
@@ -33,7 +33,7 @@ define Py3Package
 
   define Package/$(1)/install
        find $(PKG_INSTALL_DIR) -name "*\.pyc" -o -name "*\.pyo" | xargs rm -f
-       @$(SH_FUNC) getvar $$(call shvar,Py3Package/$(1)/filespec) | ( \
+       @echo "$$$$$$$$$$(call shvar,PyPackage/$(1)/filespec)" | ( \
                IFS='|'; \
                while read fop fspec fperm; do \
                  if [ "$$$$$$$$fop" = "+" ]; then \

diff --git a/sound/forked-daapd/Makefile b/sound/forked-daapd/Makefile
index e7319e9aeb24fd1a450a674ab79d27b513e11110..5f94b071528cf6dda1c4a650e31594ece858cd56 100644 (file)
--- a/sound/forked-daapd/Makefile
+++ b/sound/forked-daapd/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=forked-daapd
 PKG_VERSION:=22.0
-PKG_RELEASE:=20141016
+PKG_RELEASE:=20141022
 PKG_REV:=61a4da215c05b621951aa3903d7d390fd1839537
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
@@ -35,8 +35,8 @@ CATEGORY:=Sound
 TITLE:=Improved iTunes (DAAP) server. Support for Apple Remote and AirPlay.
 URL:=https://github.com/ejurgensen/forked-daapd
 DEPENDS:=+libgpg-error +libgcrypt +libgdbm +zlib +libexpat +libunistring \
-       +libevent +libdaemon +libantlr3c +confuse +glib2 +alsa-lib +libffmpeg-full \
-       +mxml +libavl +avahi-daemon +libavahi-client +sqlite3-cli +libplist
+       +libevent2 +libdaemon +libantlr3c +confuse +glib2 +alsa-lib +libffmpeg-full \
+       +mxml +libavl +avahi-daemon +libavahi-client +sqlite3-cli +libplist +libcurl
 endef
 
 define Package/forked-daapd/conffiles
@@ -44,11 +44,8 @@ define Package/forked-daapd/conffiles
 endef
 
 CONFIGURE_ARGS += \
-       --enable-itunes
-
-# Fix for libevent
-TARGET_CPPFLAGS += -I$(STAGING_DIR)/usr/include/libevent
-TARGET_LDFLAGS += -L$(STAGING_DIR)/usr/lib/libevent
+       --enable-itunes \
+       --enable-lastfm
 
 TARGET_CFLAGS += $(FPIC)
 TARGET_LDFLAGS += -Wl,-rpath-link,$(STAGING_DIR)/usr/lib

diff --git a/utils/lxc/Config.in b/utils/lxc/Config.in
index cb59238afe0e9f9cb00894ff9b4f633c06a6e10c..37286bfab4f30f54829c0208620bfb5d135c05c7 100644 (file)
--- a/utils/lxc/Config.in
+++ b/utils/lxc/Config.in
@@ -19,6 +19,8 @@ config LXC_BUSYBOX_OPTIONS
        select BUSYBOX_CONFIG_HAVE_DOT_CONFIG
        select BUSYBOX_CONFIG_FEATURE_SEAMLESS_XZ
        select BUSYBOX_CONFIG_FEATURE_TAR_LONG_OPTIONS
+       select BUSYBOX_CONFIG_UNXZ
+       select BUSYBOX_CONFIG_XZ
        select BUSYBOX_CONFIG_GETOPT
        select BUSYBOX_CONFIG_FEATURE_GETOPT_LONG
        help

diff --git a/utils/lxc/Makefile b/utils/lxc/Makefile
index 1315fec23e67e38e9aa1293e4b36bce4dde8850d..0f34eeafe37e7d83d36aa6914e91d6d43b7894c4 100644 (file)
--- a/utils/lxc/Makefile
+++ b/utils/lxc/Makefile
@@ -163,6 +163,8 @@ define Package/lxc-common/install
        $(CP) \
                $(PKG_INSTALL_DIR)/etc/lxc/default.conf \
                $(1)/etc/lxc/lxc.conf
+
+       $(INSTALL_DIR) $(1)/lxc/
 endef
 
 define Package/lxc-hooks/install

diff --git a/utils/lxc/patches/202-add-openwrt-common-config.patch b/utils/lxc/patches/202-add-openwrt-common-config.patch
new file mode 100644 (file)
index 0000000..6736d9b
--- /dev/null
+++ b/utils/lxc/patches/202-add-openwrt-common-config.patch
@@ -0,0 +1,78 @@
+--- /dev/null
++++ b/config/templates/openwrt.common.conf.in
+@@ -0,0 +1,56 @@
++# Default mount entries
++lxc.mount.entry = proc proc proc nodev,noexec,nosuid 0 0
++lxc.mount.entry = sysfs sys sysfs defaults 0 0
++
++# Default console settings
++lxc.devttydir = lxc
++lxc.tty = 4
++lxc.pts = 1024
++
++# Default capabilities
++lxc.cap.drop = mac_admin
++lxc.cap.drop = mac_override
++lxc.cap.drop = sys_admin
++lxc.cap.drop = sys_module
++lxc.cap.drop = sys_nice
++lxc.cap.drop = sys_pacct
++lxc.cap.drop = sys_ptrace
++lxc.cap.drop = sys_rawio
++lxc.cap.drop = sys_resource
++lxc.cap.drop = sys_time
++lxc.cap.drop = sys_tty_config
++lxc.cap.drop = syslog
++lxc.cap.drop = wake_alarm
++
++# Default cgroups - all denied except those whitelisted
++lxc.cgroup.devices.deny = a
++## /dev/null and zero
++lxc.cgroup.devices.allow = c 1:3 rwm
++lxc.cgroup.devices.allow = c 1:5 rwm
++## consoles
++lxc.cgroup.devices.allow = c 5:0 rwm
++lxc.cgroup.devices.allow = c 5:1 rwm
++## /dev/{,u}random
++lxc.cgroup.devices.allow = c 1:8 rwm
++lxc.cgroup.devices.allow = c 1:9 rwm
++## /dev/pts/*
++lxc.cgroup.devices.allow = c 5:2 rwm
++lxc.cgroup.devices.allow = c 136:* rwm
++## rtc
++lxc.cgroup.devices.allow = c 254:0 rm
++## fuse
++lxc.cgroup.devices.allow = c 10:229 rwm
++## tun
++lxc.cgroup.devices.allow = c 10:200 rwm
++## dev/tty0
++lxc.cgroup.devices.allow = c 4:0 rwm
++## dev/tty1
++lxc.cgroup.devices.allow = c 4:1 rwm
++
++## To use loop devices, copy the following line to the container's
++## configuration file (uncommented).
++#lxc.cgroup.devices.allow = b 7:* rwm
++
++# Blacklist some syscalls which are not safe in privileged
++# containers
++lxc.seccomp = /usr/share/lxc/config/common.seccomp
+--- a/configure.ac
++++ b/configure.ac
+@@ -579,6 +579,7 @@ AC_CONFIG_FILES([
+       config/templates/ubuntu.common.conf
+       config/templates/ubuntu.lucid.conf
+       config/templates/ubuntu.userns.conf
++      config/templates/openwrt.common.conf
+       config/yum/Makefile
+ 
+       doc/Makefile
+--- a/config/templates/Makefile.am
++++ b/config/templates/Makefile.am
+@@ -22,4 +22,5 @@ templatesconfig_DATA = \
+       ubuntu-cloud.userns.conf \
+       ubuntu.common.conf \
+       ubuntu.lucid.conf \
+-      ubuntu.userns.conf
++      ubuntu.userns.conf \
++      openwrt.common.conf