diff options
80 files changed, 8598 insertions, 2988 deletions
@@ -1,4 +1,5 @@ +- arm: thumb mode with glibc does not boot +- arm: vexpress network card emulation not working - sparc: uclibc toolchain is broken - sparc64: ide driver not working, only virtio (but unstable) - microblaze big endian: network card emulation fails -- microblaze: qemu reboot not working @@ -121,8 +121,8 @@ config ADK_KERNEL_VERSION_3_11_10 prompt "3.11.10" boolean -config ADK_KERNEL_VERSION_3_4_71 - prompt "3.4.71" +config ADK_KERNEL_VERSION_3_4_82 + prompt "3.4.82" boolean endchoice @@ -132,7 +132,7 @@ config ADK_KERNEL_VERSION default "3.13.5" if ADK_KERNEL_VERSION_3_13_5 default "3.12.13" if ADK_KERNEL_VERSION_3_12_13 default "3.11.10" if ADK_KERNEL_VERSION_3_11_10 - default "3.4.71" if ADK_KERNEL_VERSION_3_4_71 + default "3.4.82" if ADK_KERNEL_VERSION_3_4_82 help config ADK_KERNEL_COMP_GZIP_RASPBERRY_PI @@ -1,4 +1,7 @@ - update gcc to 4.8.2 +- socat openssl flavour + update +- use gnu_host_name for host_ dir +- move target/tools to tools, mv binaries to host_ dir, use ADK_HOST_NEED_FOO (xz,lzop,bzip2,..) - add toolchain archive creation target (optimize for size) - hash-style=gnu for non-mips and non-musl - add arm hard and softfloat toolchains diff --git a/mk/build.mk b/mk/build.mk index 1a458c870..eadccdcb3 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -35,6 +35,7 @@ DEFCONFIG= ADK_DEBUG=n \ ADK_PACKAGE_URLGRABBER=n \ ADK_PACKAGE_LIBSSP=n \ ADK_PACKAGE_OPENAFS=n \ + ADK_PACKAGE_OPENJDK7=n \ ADK_PKG_XORG=n \ ADK_PKG_MPDBOX=n \ ADK_PKG_DEVELOPMENT=n \ diff --git a/mk/kernel-ver.mk b/mk/kernel-ver.mk index 4555e6aa6..17f189d04 100644 --- a/mk/kernel-ver.mk +++ b/mk/kernel-ver.mk @@ -22,9 +22,9 @@ KERNEL_MOD_VERSION:= $(KERNEL_VERSION) KERNEL_RELEASE:= 1 KERNEL_MD5SUM:= 59f352d3f4e2cdf6755f79e09fa09176 endif -ifeq ($(ADK_KERNEL_VERSION_3_4_71),y) -KERNEL_VERSION:= 3.4.71 +ifeq ($(ADK_KERNEL_VERSION_3_4_82),y) +KERNEL_VERSION:= 3.4.82 KERNEL_MOD_VERSION:= $(KERNEL_VERSION) KERNEL_RELEASE:= 1 -KERNEL_MD5SUM:= d6183a3809c6d3f6779043b6e9f482ca +KERNEL_MD5SUM:= 9ee57efa65417a7a9ac931122c2b7377 endif diff --git a/package/base-files/Makefile b/package/base-files/Makefile index 0b0f95950..0eb3a40b3 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:= 65 +PKG_RELEASE:= 66 PKG_SECTION:= base PKG_DESCR:= basic files and scripts PKG_BUILDDEP:= pkgconf-host file-host @@ -63,7 +63,10 @@ endif cat ./files/inittab.serial >> $(IDIR_BASE_FILES)/etc/inittab test -z $(ADK_RUNTIME_CONSOLE_BOTH) || \ cat ./files/inittab.vga >> $(IDIR_BASE_FILES)/etc/inittab -ifeq ($(ADK_TARGET_QEMU_ARM_MODEL_VERSATILE),y) +ifeq ($(ADK_TARGET_QEMU_ARM_MODEL_VERSATILEPB),y) + $(SED) 's#ttyS#ttyAMA#g' $(IDIR_BASE_FILES)/etc/inittab +endif +ifeq ($(ADK_TARGET_QEMU_ARM_MODEL_VEXPRESS_A9),y) $(SED) 's#ttyS#ttyAMA#g' $(IDIR_BASE_FILES)/etc/inittab endif ifeq ($(ADK_TARGET_SYSTEM_ARANYM_M68K),y) @@ -111,11 +114,11 @@ ifneq (${ADK_SIMPLE_NETWORK_CONFIG},) echo -e "auto lo\niface lo inet loopback" > ${IDIR_BASE_FILES}/etc/network/interfaces # network config eth0 - # configure nic with manual ip + # configure nic with dhcp ifeq (${SIMPLE_NETWORK_CONFIG_ETH0_TYPE_NIC},y) echo -e "\nauto eth0\niface eth0 inet dhcp" >> ${IDIR_BASE_FILES}/etc/network/interfaces endif - # configure nic with dhcp + # configure nic with manual ip ifeq (${SIMPLE_NETWORK_CONFIG_ETH0_TYPE_NIC_MANUAL},y) echo -e "\nauto eth0\niface eth0 inet static" >> ${IDIR_BASE_FILES}/etc/network/interfaces echo -e " address ${SIMPLE_NETWORK_CONFIG_ETH0_IP}" >> ${IDIR_BASE_FILES}/etc/network/interfaces @@ -137,12 +140,17 @@ ifeq (${SIMPLE_NETWORK_CONFIG_ETH0_TYPE_BRIDGE_IP},y) echo -e " bridge-ports ${SIMPLE_NETWORK_CONFIG_ETH0_BRIDGE}" >> ${IDIR_BASE_FILES}/etc/network/interfaces endif + # network config wlan0 +ifeq (${SIMPLE_NETWORK_CONFIG_WLAN0_TYPE_NIC},y) + echo -e "\nauto wlan0\niface wlan0 inet dhcp" >> ${IDIR_BASE_FILES}/etc/network/interfaces +endif + # network config eth1 - # configure nic with manual ip + # configure nic with dhcp ifeq (${SIMPLE_NETWORK_CONFIG_ETH1_TYPE_NIC},y) echo -e "\nauto eth1\niface eth1 inet dhcp" >> ${IDIR_BASE_FILES}/etc/network/interfaces endif - # configure nic with dhcp + # configure nic with manual ip ifeq (${SIMPLE_NETWORK_CONFIG_ETH1_TYPE_NIC_MANUAL},y) echo -e "\nauto eth1\niface eth1 inet static" >> ${IDIR_BASE_FILES}/etc/network/interfaces echo -e " address ${SIMPLE_NETWORK_CONFIG_ETH1_IP}" >> ${IDIR_BASE_FILES}/etc/network/interfaces diff --git a/package/base-files/src/etc/network/if-post-down.d/03-wireless b/package/base-files/src/etc/network/if-post-down.d/03-wireless index 86e0c73e1..67c01714e 100755 --- a/package/base-files/src/etc/network/if-post-down.d/03-wireless +++ b/package/base-files/src/etc/network/if-post-down.d/03-wireless @@ -1,4 +1,5 @@ -#!/bin/sh +#!/bin/sh +set -x set -e [ "${IFACE%%[0-9]*}" = "wlan" ] || exit 0 @@ -11,7 +12,7 @@ case "$IF_WIRELESS_MODE" in sta) [ "$IF_WIRELESS_SECURITY" != "none" ] && { logger -t wireless "Killing wpa_supplicant" - pkill wpa_supplicant + kill -9 $(cat /var/run/wpa_supplicant.pid) } ;; *) diff --git a/package/base-files/src/etc/network/if-pre-up.d/04-wireless b/package/base-files/src/etc/network/if-pre-up.d/04-wireless index f69f273d0..98ac932df 100755 --- a/package/base-files/src/etc/network/if-pre-up.d/04-wireless +++ b/package/base-files/src/etc/network/if-pre-up.d/04-wireless @@ -107,7 +107,7 @@ case "$IF_WIRELESS_MODE" in echo " psk=\"$IF_WIRELESS_PASSPHRASE\"" >> /tmp/wpa_supplicant.conf echo " priority=5" >> /tmp/wpa_supplicant.conf echo "}" >> /tmp/wpa_supplicant.conf - wpa_supplicant -B -D${driver} -i${IFACE} -c/tmp/wpa_supplicant.conf + wpa_supplicant -B -D${driver} -i${IFACE} -P/var/run/wpa_supplicant.pid -c/tmp/wpa_supplicant.conf } ;; *) diff --git a/package/firefox/files/firefox b/package/firefox/files/firefox index fd372f5b5..339daaf09 100755 --- a/package/firefox/files/firefox +++ b/package/firefox/files/firefox @@ -1,2 +1,2 @@ #!/bin/sh -env LD_LIBRARY_PATH=/usr/lib/firefox-24.0 /usr/lib/firefox-24.0/firefox +env LD_LIBRARY_PATH=/usr/lib/firefox-26.0 /usr/lib/firefox-26.0/firefox diff --git a/package/libpcap/Makefile b/package/libpcap/Makefile index 51b470aae..d374fc5a5 100644 --- a/package/libpcap/Makefile +++ b/package/libpcap/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= libpcap PKG_VERSION:= 1.5.2 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 33ba2f10f3a402cb5d34f5e2a904794a PKG_DESCR:= a low-level packet capture library PKG_SECTION:= libs @@ -24,6 +24,7 @@ $(eval $(call PKG_template,LIBPCAP,libpcap,$(PKG_VERSION)-${PKG_RELEASE},${PKG_D CONFIGURE_ENV+= ac_cv_linux_vers=26 CONFIGURE_ARGS+= --disable-yydebug \ --with-build-cc=$(CC_FOR_BUILD) \ + --disable-dbus \ --without-libnl \ --with-pcap=linux TARGET_CFLAGS+= ${TARGET_CPPFLAGS} diff --git a/package/nss/Makefile b/package/nss/Makefile index 868dd5d4d..75921e8c5 100644 --- a/package/nss/Makefile +++ b/package/nss/Makefile @@ -30,8 +30,8 @@ $(eval $(call PKG_template,NSS,nss,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS}, CONFIG_STYLE:= manual INSTALL_STYLE:= manual -ifneq ($(ADK_LINUX_64),) -ifeq ($(ADK_LINUX_MIPS),y) +ifeq ($(ADK_LINUX_64),y) +ifeq ($(ADK_TARGET_ABI_N32),y) TARGET_CFLAGS+= -DNS_PTR_LE_32 endif XAKE_FLAGS+= USE_64=1 diff --git a/package/strace/Makefile b/package/strace/Makefile index 624cf8909..9f0cfe047 100644 --- a/package/strace/Makefile +++ b/package/strace/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= strace PKG_VERSION:= 4.8 -PKG_RELEASE:= 7 +PKG_RELEASE:= 8 PKG_MD5SUM:= c575ef43829586801f514fd91bfe7575 PKG_DESCR:= System call trace program PKG_SECTION:= debug diff --git a/package/strace/patches/patch-defs_h b/package/strace/patches/patch-defs_h new file mode 100644 index 000000000..910715f7a --- /dev/null +++ b/package/strace/patches/patch-defs_h @@ -0,0 +1,33 @@ +--- strace-4.8.orig/defs.h 2013-05-14 16:10:42.000000000 +0200 ++++ strace-4.8/defs.h 2014-02-26 17:36:34.000000000 +0100 +@@ -155,18 +155,18 @@ extern char *stpcpy(char *dst, const cha + || defined(METAG) \ + || defined(TILE) \ + || defined(XTENSA) \ +- ) && defined(__GLIBC__) ++ ) && defined(__linux__) + # include <sys/ptrace.h> + #else + /* Work around awkward prototype in ptrace.h. */ + # define ptrace xptrace + # include <sys/ptrace.h> + # undef ptrace +-# ifdef POWERPC ++#if defined(POWERPC) && defined(__GLIBC__) + # define __KERNEL__ + # include <asm/ptrace.h> + # undef __KERNEL__ +-# endif ++#endif + extern long ptrace(int, int, char *, long); + #endif + +@@ -222,7 +222,7 @@ extern long ptrace(int, int, char *, lon + # define PTRACE_EVENT_EXIT 6 + #endif + +-#if !defined(__GLIBC__) ++#if !defined(__GLIBC__) && !defined(PTRACE_PEEKUSER) + # define PTRACE_PEEKUSER PTRACE_PEEKUSR + # define PTRACE_POKEUSER PTRACE_POKEUSR + #endif diff --git a/package/strace/patches/patch-desc_c b/package/strace/patches/patch-desc_c new file mode 100644 index 000000000..9cfb5f505 --- /dev/null +++ b/package/strace/patches/patch-desc_c @@ -0,0 +1,11 @@ +--- strace-4.8.orig/desc.c 2013-05-02 00:39:10.000000000 +0200 ++++ strace-4.8/desc.c 2014-02-25 15:16:36.000000000 +0100 +@@ -223,7 +223,7 @@ static const struct xlat perf_event_open + { 0, NULL }, + }; + +-#if _LFS64_LARGEFILE ++#if defined(_LFS64_LARGEFILE) && defined(__GLIBC__) || defined(__UCLIBC__) + /* fcntl/lockf */ + static void + printflock64(struct tcb *tcp, long addr, int getlk) diff --git a/package/strace/patches/patch-net_c b/package/strace/patches/patch-net_c new file mode 100644 index 000000000..f579ea5fb --- /dev/null +++ b/package/strace/patches/patch-net_c @@ -0,0 +1,17 @@ +--- strace-4.8.orig/net.c 2013-05-18 00:20:02.000000000 +0200 ++++ strace-4.8/net.c 2014-02-25 16:06:44.000000000 +0100 +@@ -95,12 +95,14 @@ + #endif + + /* Under Linux these are enums so we can't test for them with ifdef. */ ++#if !defined(IPPROTO_MAX) + #define IPPROTO_EGP IPPROTO_EGP + #define IPPROTO_PUP IPPROTO_PUP + #define IPPROTO_IDP IPPROTO_IDP + #define IPPROTO_IGMP IPPROTO_IGMP + #define IPPROTO_RAW IPPROTO_RAW + #define IPPROTO_MAX IPPROTO_MAX ++#endif + + static const struct xlat domains[] = { + #ifdef PF_UNSPEC diff --git a/package/strace/patches/patch-process_c b/package/strace/patches/patch-process_c new file mode 100644 index 000000000..a3d71bc9e --- /dev/null +++ b/package/strace/patches/patch-process_c @@ -0,0 +1,49 @@ +--- strace-4.8.orig/process.c 2013-05-18 00:22:19.000000000 +0200 ++++ strace-4.8/process.c 2014-02-25 20:02:55.000000000 +0100 +@@ -55,7 +55,7 @@ + # endif + #endif + +-#ifdef HAVE_LINUX_PTRACE_H ++#if defined(HAVE_LINUX_PTRACE_H) && defined(__ |