From 28e9a68b020cdbde0e1e71a4967bee0bc26a0890 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 29 Mar 2014 10:33:08 +0100 Subject: use xz instead of gzip, remove grub for qemu, add it only to ibm-x40 --- package/grub-bin/Makefile | 1 - 1 file changed, 1 deletion(-) (limited to 'package') diff --git a/package/grub-bin/Makefile b/package/grub-bin/Makefile index 7b52cdafa..352c2b572 100644 --- a/package/grub-bin/Makefile +++ b/package/grub-bin/Makefile @@ -18,7 +18,6 @@ PKG_ARCH_DEPENDS:= x86 x86_64 PKG_CFLINE_GRUB_BIN:= select BUSYBOX_FEATURE_STAT_FORMAT@ PKG_CFLINE_GRUB_BIN+= depends on !ADK_TARGET_ROOTFS_INITRAMFS_PIGGYBACK && !ADK_TARGET_ROOTFS_INITRAMFS -PKG_DFLT_GRUB_BIN:= y if !ADK_TOOLCHAIN_ONLY && !ADK_TOOLCHAIN_ARCHIVE include ${TOPDIR}/mk/package.mk -- cgit v1.2.3 From 789b40253406be3f67a65ed6a2d1ee145dd456d9 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 29 Mar 2014 11:04:15 +0100 Subject: install ipkg stuff only when choosen, be quit for rstrip, do not execute make prereq --- package/base-files/Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'package') diff --git a/package/base-files/Makefile b/package/base-files/Makefile index 3711e7a00..e01edb042 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:= 79 +PKG_RELEASE:= 80 PKG_SECTION:= base PKG_DESCR:= basic files and scripts PKG_BUILDDEP:= pkgconf-host file-host @@ -27,6 +27,7 @@ do-install: ifeq (${ADK_TARGET_ROOTFS_NFSROOT},y) @echo "#" > $(IDIR_BASE_FILES)/etc/network/interfaces endif +ifeq (${ADK_TARGET_PACKAGE_IPKG},y) $(SED) 's,@ARCH@,$(ADK_TARGET_CPU_ARCH),g' $(IDIR_BASE_FILES)/etc/ipkg.conf $(SED) 's,@SYSTEM@,$(ADK_TARGET_SYSTEM),g' $(IDIR_BASE_FILES)/etc/ipkg.conf $(SED) 's,@LIBC@,$(ADK_TARGET_LIBC),g' $(IDIR_BASE_FILES)/etc/ipkg.conf @@ -37,6 +38,8 @@ else endif $(SED) 's,@HOST@,$(ADK_HOST),g' $(IDIR_BASE_FILES)/etc/ipkg.conf $(SED) 's,@VENDOR@,$(ADK_VENDOR),g' $(IDIR_BASE_FILES)/etc/ipkg.conf + mkdir -p $(IDIR_BASE_FILES)/usr/lib/ipkg/lists +endif echo /bin/sh >${IDIR_BASE_FILES}/etc/shells echo /bin/mksh >>${IDIR_BASE_FILES}/etc/shells ifneq (${ADK_PACKAGE_ASH},) @@ -48,7 +51,6 @@ endif ifneq (${ADK_PACKAGE_ZSH},) echo /bin/zsh >>${IDIR_BASE_FILES}/etc/shells endif - mkdir -p $(IDIR_BASE_FILES)/usr/lib/ipkg/lists mkdir -p $(IDIR_BASE_FILES)/etc/crontabs mkdir -p $(IDIR_BASE_FILES)/{dev,boot,root,sys,proc,tmp,mnt} mkdir -p $(IDIR_BASE_FILES)/etc/network/{if-pre-up.d,if-up.d,if-down.d,if-post-down.d} -- cgit v1.2.3 From 0e982bcca6f6daff1da58e3d3f5e3e89bdc723ab Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 29 Mar 2014 14:45:33 +0100 Subject: update to latest upstream --- package/sox/Makefile | 6 +++--- package/sox/patches/patch-ltmain_sh | 11 ----------- package/sox/patches/patch-src_formats_c | 19 +++++-------------- 3 files changed, 8 insertions(+), 28 deletions(-) delete mode 100644 package/sox/patches/patch-ltmain_sh (limited to 'package') diff --git a/package/sox/Makefile b/package/sox/Makefile index 2f5436146..5072bca01 100644 --- a/package/sox/Makefile +++ b/package/sox/Makefile @@ -4,10 +4,10 @@ include $(TOPDIR)/rules.mk PKG_NAME:= sox -PKG_VERSION:= 14.3.2 +PKG_VERSION:= 14.4.1 PKG_RELEASE:= 1 -PKG_MD5SUM:= e9d35cf3b0f8878596e0b7c49f9e8302 -PKG_DESCR:= Swiss Army knife of sound processing programs +PKG_MD5SUM:= 670307f40763490a2bc0d1f322071e7a +PKG_DESCR:= swiss army knife of sound processing programs PKG_SECTION:= multimedia PKG_BUILDDEP:= zlib libmad lame alsa-lib libid3tag PKG_DEPENDS:= zlib libmad liblame alsa-lib libid3tag diff --git a/package/sox/patches/patch-ltmain_sh b/package/sox/patches/patch-ltmain_sh deleted file mode 100644 index 722e3e762..000000000 --- a/package/sox/patches/patch-ltmain_sh +++ /dev/null @@ -1,11 +0,0 @@ ---- sox-14.3.2.orig/ltmain.sh 2011-01-04 06:04:29.000000000 +0100 -+++ sox-14.3.2/ltmain.sh 2011-03-06 00:04:37.000000000 +0100 -@@ -5091,7 +5091,7 @@ func_mode_link () - # @file GCC response files - # -tp=* Portland pgcc target processor selection - -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ -- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*) -+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|-fstack-protector*|-flto*) - func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" - func_append compile_command " $arg" diff --git a/package/sox/patches/patch-src_formats_c b/package/sox/patches/patch-src_formats_c index fc298ba8e..da9a7ed28 100644 --- a/package/sox/patches/patch-src_formats_c +++ b/package/sox/patches/patch-src_formats_c @@ -1,20 +1,11 @@ ---- sox-14.3.1.orig/src/formats.c 2010-01-02 01:07:28.000000000 +0100 -+++ sox-14.3.1/src/formats.c 2011-03-01 22:15:05.000000000 +0100 -@@ -399,7 +399,7 @@ static void UNUSED rewind_pipe(FILE * fp - #if defined _FSTDIO || defined _NEWLIB_VERSION || defined __APPLE__ - fp->_p -= AUTO_DETECT_SIZE; - fp->_r += AUTO_DETECT_SIZE; --#elif defined __GLIBC__ -+#elif defined __GLIBC__ && ! defined __UCLIBC__ - fp->_IO_read_ptr = fp->_IO_read_base; - #elif defined _MSC_VER || defined __MINGW_H || defined _ISO_STDIO_ISO_H - fp->_ptr = fp->_base; -@@ -407,7 +407,7 @@ static void UNUSED rewind_pipe(FILE * fp +--- sox-14.4.1.orig/src/formats.c 2013-01-13 20:57:39.000000000 +0100 ++++ sox-14.4.1/src/formats.c 2014-03-29 14:43:56.000000000 +0100 +@@ -417,7 +417,7 @@ 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.au | ./sox --info - */ + * lines above. Test with cat monkey.wav | ./sox --info - */ - #error FIX NEEDED HERE -+/* #error FIX NEEDED HERE */ ++ //#error FIX NEEDED HERE #define NO_REWIND_PIPE (void)fp; #endif -- cgit v1.2.3 From a1bfe2ccebcdfd8fb4a76a24dea3493ff53f14b5 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 29 Mar 2014 15:01:07 +0100 Subject: forgot the uclibc patch --- package/sox/Makefile | 2 +- package/sox/patches/patch-src_formats_c | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) (limited to 'package') diff --git a/package/sox/Makefile b/package/sox/Makefile index 5072bca01..af30a9199 100644 --- a/package/sox/Makefile +++ b/package/sox/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= sox PKG_VERSION:= 14.4.1 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 670307f40763490a2bc0d1f322071e7a PKG_DESCR:= swiss army knife of sound processing programs PKG_SECTION:= multimedia diff --git a/package/sox/patches/patch-src_formats_c b/package/sox/patches/patch-src_formats_c index da9a7ed28..8ad23c63b 100644 --- a/package/sox/patches/patch-src_formats_c +++ b/package/sox/patches/patch-src_formats_c @@ -1,5 +1,14 @@ --- sox-14.4.1.orig/src/formats.c 2013-01-13 20:57:39.000000000 +0100 -+++ sox-14.4.1/src/formats.c 2014-03-29 14:43:56.000000000 +0100 ++++ sox-14.4.1/src/formats.c 2014-03-29 15:00:39.000000000 +0100 +@@ -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,7 @@ 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 -- cgit v1.2.3 From 196013d337b14a1a2af03e7c04accc7460443f62 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 30 Mar 2014 14:28:10 +0200 Subject: update to latest upstream version --- package/radvd/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package') diff --git a/package/radvd/Makefile b/package/radvd/Makefile index 1dd5b6ccf..dc927a628 100644 --- a/package/radvd/Makefile +++ b/package/radvd/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= radvd -PKG_VERSION:= 1.9.7 +PKG_VERSION:= 1.10.0 PKG_RELEASE:= 1 -PKG_MD5SUM:= 85141c7dc7d35e5499e16052742f1040 +PKG_MD5SUM:= 5ef15bc6c8316dba02147065f8dfdad3 PKG_DESCR:= Routing Advertisement Daemon for IPv6 PKG_SECTION:= ipv6 PKG_DEPENDS:= kmod-ipv6 libdaemon -- cgit v1.2.3