diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-02-26 19:12:00 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-02-26 19:12:00 +0100 |
| commit | 49a2312ba19ddcd7fecc1ac8177cd1ae1346c4cc (patch) | |
| tree | 1d9dc20e6d2b987158addd0da286f044eb1d1aee | |
| parent | 1e14d6284640f07c21d837091c7f87323209b317 (diff) | |
| parent | 9e358d94cc283c8022091e67fe3ca0580301a62a (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
73 files changed, 405 insertions, 2984 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 diff --git a/mk/build.mk b/mk/build.mk index b322ba6a2..eadccdcb3 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -146,7 +146,7 @@ ${TOPDIR}/package/Depends.mk: ${TOPDIR}/.config $(wildcard ${TOPDIR}/package/*/M world: mkdir -p $(DISTDIR) $(BUILD_DIR) $(TARGET_DIR) $(FW_DIR) \ $(PACKAGE_DIR) $(BIN_DIR) $(TOOLS_BUILD_DIR) \ - $(TOOLCHAIN_BUILD_DIR) $(STAGING_PKG_DIR) + $(TOOLCHAIN_BUILD_DIR) $(STAGING_PKG_DIR)/stamps ${BASH} ${TOPDIR}/scripts/scan-pkgs.sh ${BASH} ${TOPDIR}/scripts/update-sys ${BASH} ${TOPDIR}/scripts/update-pkg diff --git a/mk/host-bottom.mk b/mk/host-bottom.mk index 4b75a3f42..23d5652ba 100644 --- a/mk/host-bottom.mk +++ b/mk/host-bottom.mk @@ -96,14 +96,14 @@ endif exec ${MAKE} host-extract $(MAKE_TRACE) mkdir -p ${HOST_WRKINST} # avoid rebuild - touch ${_HOST_CONFIGURE_COOKIE} - touch ${_HOST_BUILD_COOKIE} - touch $@ + @touch ${_HOST_CONFIGURE_COOKIE} + @touch ${_HOST_BUILD_COOKIE} + @touch $@ ${_HOST_COOKIE}: exec ${MAKE} hostpackage ifeq ($(HOST_LINUX_ONLY),) hostpackage: ${ALL_HOSTDIRS} - touch ${_HOST_COOKIE} + @touch ${_HOST_COOKIE} endif 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/mk/package.mk b/mk/package.mk index b9b198e57..125ed3d26 100644 --- a/mk/package.mk +++ b/mk/package.mk @@ -78,7 +78,7 @@ _PATCH_COOKIE= ${WRKDIST}/.prepared _CONFIGURE_COOKIE= ${WRKBUILD}/.configure_done _BUILD_COOKIE= ${WRKBUILD}/.build_done _FAKE_COOKIE= ${WRKINST}/.fake_done -_IPKGS_COOKIE= ${STAGING_PKG_DIR}/${PKG_NAME}${PKG_VERSION}-${PKG_RELEASE} +_IPKGS_COOKIE= ${STAGING_PKG_DIR}/stamps/${PKG_NAME}${PKG_VERSION}-${PKG_RELEASE} _IN_PACKAGE:= 1 include ${TOPDIR}/mk/buildhlp.mk @@ -225,7 +225,7 @@ ifneq (${ADK_INSTALL_PACKAGE_NETWORK_SCRIPTS},y) -rm -rf $${IDIR_$(1)}/etc/network endif endif - @mkdir -p $${PACKAGE_DIR} '$${STAGING_PKG_DIR}' \ + @mkdir -p $${PACKAGE_DIR} '$${STAGING_PKG_DIR}/stamps' \ '$${STAGING_DIR}/scripts' ifeq (,$(filter noremove,$(7))) @if test -s '$${STAGING_PKG_DIR}/$(1)'; then \ @@ -321,7 +321,7 @@ clean-targets: clean: @$(CMD_TRACE) "cleaning... " @$(MAKE) clean-targets $(MAKE_TRACE) - rm -rf ${WRKDIR} ${ALL_IPKGS} ${STAGING_PKG_DIR}/${PKG_NAME}* + rm -rf ${WRKDIR} ${ALL_IPKGS} ${STAGING_PKG_DIR}/stamps/${PKG_NAME}* distclean: clean rm -f ${FULLDISTFILES} diff --git a/mk/pkg-bottom.mk b/mk/pkg-bottom.mk index c6e328bbe..d82a653ea 100644 --- a/mk/pkg-bottom.mk +++ b/mk/pkg-bottom.mk @@ -126,7 +126,7 @@ post-install: spkg-install: ${ALL_POSTINST} ${_FAKE_COOKIE}: ${_BUILD_COOKIE} @-rm -f ${_ALL_CONTROLS} - @mkdir -p '${STAGING_PKG_DIR}' ${WRKINST} '${STAGING_DIR}/scripts' + @mkdir -p '${STAGING_PKG_DIR}/stamps' ${WRKINST} '${STAGING_DIR}/scripts' @${MAKE} ${_ALL_CONTROLS} $(MAKE_TRACE) @env ${MAKE_ENV} ${MAKE} pre-install $(MAKE_TRACE) ifneq ($(filter manual,${INSTALL_STYLE}),) 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 @@ -31,6 +31,8 @@ ADK_TARGET_SYSTEM:= $(strip $(subst ",, $(ADK_TARGET_SYSTEM))) ADK_TARGET_LIBC:= $(strip $(subst ",, $(ADK_TARGET_LIBC))) ADK_TARGET_LIBC_PATH:= $(strip $(subst ",, $(ADK_TARGET_LIBC_PATH))) ADK_TARGET_ENDIAN:= $(strip $(subst ",, $(ADK_TARGET_ENDIAN))) +ADK_TARGET_FLOAT:= $(strip $(subst ",, $(ADK_TARGET_FLOAT))) +ADK_TARGET_ARM_MODE:= $(strip $(subst ",, $(ADK_TARGET_ARM_MODE))) ADK_TARGET_CPU_ARCH:= $(strip $(subst ",, $(ADK_TARGET_CPU_ARCH))) ADK_TARGET_CFLAGS:= $(strip $(subst ",, $(ADK_TARGET_CFLAGS))) ADK_TARGET_ABI_CFLAGS:= $(strip $(subst ",, $(ADK_TARGET_ABI_CFLAGS))) diff --git a/scripts/create-pkg b/scripts/create-pkg index b9b47ae2a..35961ae54 100755 --- a/scripts/create-pkg +++ b/scripts/create-pkg @@ -2,6 +2,7 @@ topdir=$(readlink -nf $(dirname $0)/.. 2>/dev/null || (cd $(dirname $0)/..; pwd -P)) mkdir -p $topdir/target/packages/pkg-enabled +rm $topdir/target/packages/pkg-enabled/* 2>/dev/null count=1 for i in $(ls $topdir/target/packages/pkg-available/);do cd $topdir/target/packages/pkg-enabled && diff --git a/target/arm/Makefile b/target/arm/Makefile index 080ac4f57..4e07cd664 100644 --- a/target/arm/Makefile +++ b/target/arm/Makefile @@ -18,9 +18,13 @@ LOADADDR:=0x20008000 ifeq ($(ADK_TARGET_QEMU_ARM_MODEL_SPITZ),y) MACH:=spitz endif -ifeq ($(ADK_TARGET_QEMU_ARM_MODEL_VERSATILE),y) +ifeq ($(ADK_TARGET_QEMU_ARM_MODEL_VERSATILEPB),y) MACH:=versatilepb -NET:=-net user,hostfwd=tcp::2222-:22 -net nic,model=smc91c111 +NET:=-net user -net nic,model=smc91c111 +endif +ifeq ($(ADK_TARGET_QEMU_ARM_MODEL_VEXPRESS_A9),y) +MACH:=vexpress-a9 +NET:=-cpu cortex-a9 -device lan9118,netdev=adk0 -netdev user,id=adk0 endif kernel-install: @@ -72,10 +76,14 @@ imageinstall: $(FW_DIR)/$(INITRAMFS) @echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}' @echo 'The initramfs image is: ${FW_DIR}/${INITRAMFS}' ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM),y) +ifeq ($(ADK_TARGET_QEMU_WITH_VIRTIO),y) + @echo 'qemu-system-arm -nographic -kernel $(FW_DIR)/$(TARGET_KERNEL) -drive file=qemu-${CPU_ARCH}.img,if=virtio,index=0 -net nic,model=virtio -net user' +else @echo "Start qemu with following command line:" @echo 'qemu-system-arm -M $(MACH) -nographic $(NET) -kernel $(FW_DIR)/$(TARGET_KERNEL) -initrd ${FW_DIR}/${INITRAMFS}' endif endif +endif ifeq ($(ADK_TARGET_FS),initramfs-piggyback) imageinstall: createinitramfs @cp $(KERNEL) $(FW_DIR)/$(TARGET_KERNEL) diff --git a/target/arm/kernel.config b/target/arm/kernel.config deleted file mode 100644 index e477fcfb8..000000000 --- a/target/arm/kernel.config +++ /dev/null @@ -1,1116 +0,0 @@ -# -# Automatically generated file; DO NOT EDIT. -# Linux/arm 3.11.10 Kernel Configuration -# -CONFIG_ARM=y -CONFIG_SYS_SUPPORTS_APM_EMULATION=y -CONFIG_HAVE_PROC_CPU=y -CONFIG_STACKTRACE_SUPPORT=y -CONFIG_HAVE_LATENCYTOP_SUPPORT=y -CONFIG_LOCKDEP_SUPPORT=y -CONFIG_TRACE_IRQFLAGS_SUPPORT=y -CONFIG_RWSEM_GENERIC_SPINLOCK=y -CONFIG_ARCH_HAS_CPUFREQ=y -CONFIG_GENERIC_HWEIGHT=y -CONFIG_GENERIC_CALIBRATE_DELAY=y -CONFIG_NEED_DMA_MAP_STATE=y -CONFIG_FIQ=y -CONFIG_VECTORS_BASE=0xffff0000 -CONFIG_ARM_PATCH_PHYS_VIRT=y -CONFIG_NEED_MACH_IO_H=y -CONFIG_NEED_MACH_MEMORY_H=y -CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" -CONFIG_IRQ_WORK=y - -# -# General setup -# -CONFIG_BROKEN_ON_SMP=y -CONFIG_INIT_ENV_ARG_LIMIT=32 -CONFIG_CROSS_COMPILE="" -# CONFIG_COMPILE_TEST is not set -CONFIG_LOCALVERSION="" -# CONFIG_LOCALVERSION_AUTO is not set -CONFIG_HAVE_KERNEL_GZIP=y -CONFIG_HAVE_KERNEL_LZMA=y -CONFIG_HAVE_KERNEL_XZ=y -CONFIG_HAVE_KERNEL_LZO=y -CONFIG_HAVE_KERNEL_LZ4=y -# CONFIG_KERNEL_GZIP is not set -# CONFIG_KERNEL_LZMA is not set -CONFIG_KERNEL_XZ=y -# CONFIG_KERNEL_LZO is not set -# CONFIG_KERNEL_LZ4 is not set -CONFIG_DEFAULT_HOSTNAME="openadk" -CONFIG_SYSVIPC=y -CONFIG_SYSVIPC_SYSCTL=y -# CONFIG_POSIX_MQUEUE is not set -# CONFIG_FHANDLE is not set -# CONFIG_AUDIT is not set -CONFIG_HAVE_GENERIC_HARDIRQS=y - -# -# IRQ subsystem -# -CONFIG_GENERIC_HARDIRQS=y -CONFIG_GENERIC_IRQ_PROBE=y -CONFIG_GENERIC_IRQ_SHOW=y -CONFIG_HARDIRQS_SW_RESEND=y -CONFIG_IRQ_DOMAIN=y -CONFIG_KTIME_SCALAR=y -CONFIG_GENERIC_CLOCKEVENTS=y -CONFIG_GENERIC_CLOCKEVENTS_BUILD=y - -# -# Timers subsystem -# -CONFIG_TICK_ONESHOT=y -CONFIG_NO_HZ_COMMON=y -# CONFIG_HZ_PERIODIC is not set -CONFIG_NO_HZ_IDLE=y -# CONFIG_NO_HZ is not set -# CONFIG_HIGH_RES_TIMERS is not set - -# -# CPU/Task time and stats accounting -# -CONFIG_TICK_CPU_ACCOUNTING=y -# CONFIG_IRQ_TIME_ACCOUNTING is not set -# CONFIG_BSD_PROCESS_ACCT is not set -# CONFIG_TASKSTATS is not set - -# -# RCU Subsystem -# -CON |