diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2014-01-20 12:10:46 +0100 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-01-20 12:10:46 +0100 |
commit | 70da005e064b87561368ff7c94b620adccd50430 (patch) | |
tree | e0563839ffc658b2795366a35a208979c2b4d0de | |
parent | 98bb4fd81aeb876160e32fbce742598df0eeafcd (diff) | |
parent | 5505e752efd2488253c910b6176cfdb047cfd904 (diff) |
eerge branch 'master' of git+ssh://openadk.org/git/openadk
-rw-r--r-- | package/base-files/Makefile | 2 | ||||
-rw-r--r-- | package/base-files/src/etc/init.d/boot | 4 | ||||
-rwxr-xr-x | package/base-files/src/init | 1 | ||||
-rw-r--r-- | package/eudev/Makefile | 2 | ||||
-rw-r--r-- | package/pulseaudio/Makefile | 3 | ||||
-rw-r--r-- | package/tcl/Makefile | 2 | ||||
-rw-r--r-- | package/tcl/patches/patch-generic_tcl_h | 11 | ||||
-rw-r--r-- | package/tcl/patches/patch-unix_Makefile_in | 6 | ||||
-rw-r--r-- | package/tcl/patches/patch-unix_configure | 10 |
9 files changed, 27 insertions, 14 deletions
diff --git a/package/base-files/Makefile b/package/base-files/Makefile index 7f68bad96..f1e0d0666 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/mk/rootfs.mk PKG_NAME:= base-files PKG_VERSION:= 1.0 -PKG_RELEASE:= 62 +PKG_RELEASE:= 63 PKG_SECTION:= base PKG_DESCR:= basic files and scripts PKG_BUILDDEP:= pkgconf-host file-host diff --git a/package/base-files/src/etc/init.d/boot b/package/base-files/src/etc/init.d/boot index ed55ccc88..df2c493d7 100644 --- a/package/base-files/src/etc/init.d/boot +++ b/package/base-files/src/etc/init.d/boot @@ -10,12 +10,10 @@ touch /var/log/lastlog touch /var/log/wtmp ln -s /tmp /var/tmp -echo 0 > /proc/sys/kernel/printk - HOSTNAME= [[ -s /etc/hostname ]] && HOSTNAME=$(cat /etc/hostname) HOSTNAME=${HOSTNAME%%.*} -echo ${HOSTNAME:=linux} >/proc/sys/kernel/hostname +echo ${HOSTNAME:=openadk} >/proc/sys/kernel/hostname chown 0:0 /tmp; chmod 1777 /tmp diff --git a/package/base-files/src/init b/package/base-files/src/init index 003808452..ad519e96d 100755 --- a/package/base-files/src/init +++ b/package/base-files/src/init @@ -3,6 +3,7 @@ echo "System initialization ..." export PATH=/bin:/sbin:/usr/bin:/usr/sbin mount -t devtmpfs devtmpfs /dev >/dev/null 2>&1 mount -nt proc proc /proc +echo 0 > /proc/sys/kernel/printk mount -o nosuid,nodev,noexec -t sysfs sysfs /sys [ ! -f /etc/notmpfs ] && { size=$(cat /etc/tmpfs 2>/dev/null) diff --git a/package/eudev/Makefile b/package/eudev/Makefile index 5cdbed66f..4bce0928c 100644 --- a/package/eudev/Makefile +++ b/package/eudev/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 164df78f6f0093578a20bdd00335845f PKG_DESCR:= udev device manager PKG_SECTION:= utils -PKG_BUILDDEP:= glib +PKG_BUILDDEP:= gperf-host glib PKG_DEPENDS:= glib PKG_URL:= http://www.gentoo.org/proj/en/eudev/ PKG_SITES:= http://dev.gentoo.org/~blueness/eudev/ diff --git a/package/pulseaudio/Makefile b/package/pulseaudio/Makefile index a854714a1..f5f148927 100644 --- a/package/pulseaudio/Makefile +++ b/package/pulseaudio/Makefile @@ -18,12 +18,15 @@ PKG_URL:= http://www.freedesktop.org/wiki/Software/PulseAudio/ PKG_SITES:= http://freedesktop.org/software/pulseaudio/releases/ PKG_OPTS:= dev +PKG_LIBC_DEPENDS:= uclibc eglibc glibc + DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,PULSEAUDIO,pulseaudio,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) +TARGET_CPPFLAGS+= -D_GNU_SOURCE -D_POSIX_SOURCE CONFIGURE_ARGS+= --disable-systemd \ --disable-manpages \ --disable-neon-opt \ diff --git a/package/tcl/Makefile b/package/tcl/Makefile index f45317d8f..df231ffdc 100644 --- a/package/tcl/Makefile +++ b/package/tcl/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= tcl PKG_VERSION:= 8.5.9 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 8512d8db3233041dd68a81476906012a PKG_DESCR:= TCL scripting language PKG_SECTION:= lang diff --git a/package/tcl/patches/patch-generic_tcl_h b/package/tcl/patches/patch-generic_tcl_h new file mode 100644 index 000000000..6263ba8f1 --- /dev/null +++ b/package/tcl/patches/patch-generic_tcl_h @@ -0,0 +1,11 @@ +--- tcl8.5.9.orig/generic/tcl.h 2010-08-04 19:02:39.000000000 +0200 ++++ tcl8.5.9/generic/tcl.h 2014-01-20 11:18:37.000000000 +0100 +@@ -19,6 +19,8 @@ + #ifndef _TCL + #define _TCL + ++#include <sys/stat.h> ++ + /* + * For C++ compilers, use extern "C" + */ diff --git a/package/tcl/patches/patch-unix_Makefile_in b/package/tcl/patches/patch-unix_Makefile_in index 7c4a9ca93..38340c80b 100644 --- a/package/tcl/patches/patch-unix_Makefile_in +++ b/package/tcl/patches/patch-unix_Makefile_in @@ -1,5 +1,5 @@ ---- tcl8.5.8.orig/unix/Makefile.in 2009-11-13 19:38:45.000000000 +0100 -+++ tcl8.5.8/unix/Makefile.in 2009-11-20 21:59:51.000000000 +0100 +--- tcl8.5.9.orig/unix/Makefile.in 2010-09-08 19:40:48.000000000 +0200 ++++ tcl8.5.9/unix/Makefile.in 2014-01-20 11:13:05.000000000 +0100 @@ -101,7 +101,8 @@ CFLAGS_OPTIMIZE = @CFLAGS_OPTIMIZE@ #CFLAGS = $(CFLAGS_DEBUG) #CFLAGS = $(CFLAGS_OPTIMIZE) @@ -10,7 +10,7 @@ # Flags to pass to the linker LDFLAGS_DEBUG = @LDFLAGS_DEBUG@ -@@ -745,7 +746,7 @@ install-binaries: binaries +@@ -737,7 +738,7 @@ install-binaries: binaries fi @EXTRA_INSTALL_BINARIES@ diff --git a/package/tcl/patches/patch-unix_configure b/package/tcl/patches/patch-unix_configure index 393c2b45e..380b8d591 100644 --- a/package/tcl/patches/patch-unix_configure +++ b/package/tcl/patches/patch-unix_configure @@ -1,6 +1,6 @@ ---- tcl8.5.8.orig/unix/configure 2009-11-13 19:38:45.000000000 +0100 -+++ tcl8.5.8/unix/configure 2011-01-13 16:22:59.000000000 +0100 -@@ -7968,9 +7968,6 @@ fi +--- tcl8.5.9.orig/unix/configure 2010-09-08 19:40:48.000000000 +0200 ++++ tcl8.5.9/unix/configure 2014-01-20 11:13:05.000000000 +0100 +@@ -7983,9 +7983,6 @@ fi LD_SEARCH_FLAGS="" LD_LIBRARY_PATH_VAR="DYLD_LIBRARY_PATH" @@ -10,7 +10,7 @@ PLAT_OBJS='${MAC_OSX_OBJS}' PLAT_SRCS='${MAC_OSX_SRCS}' -@@ -17646,11 +17643,6 @@ _ACEOF +@@ -17578,11 +17575,6 @@ _ACEOF cat >>confdefs.h <<\_ACEOF @@ -22,7 +22,7 @@ #define TCL_WIDE_CLICKS 1 _ACEOF -@@ -18817,7 +18809,7 @@ HTML_DIR='$(DISTDIR)/html' +@@ -18749,7 +18741,7 @@ HTML_DIR='$(DISTDIR)/html' # AIX remembers this path and will attempt to use it at run-time to look # up the Tcl library. |