diff options
87 files changed, 2442 insertions, 553 deletions
@@ -97,7 +97,7 @@ prompt "Kernel Version" depends on ADK_TOOLCHAIN_ONLY config ADK_KERNEL_VERSION_TOOLCHAIN - prompt "3.11.10" + prompt "3.12.6" boolean depends on ADK_TOOLCHAIN_ONLY @@ -1,6 +1,10 @@ - qemu-system-mips64el memory alloc probs - hash-style=gnu for non-mips and non-musl - add toolchain archive creation target +- add hash-style=gnu for non-mips non-musl +- add arm hard and softfloat toolchains +- add misp64 n32/n64 toolchains +- add support for static toolchains - add fb full screen logo - update gcc to 4.8.2 - port opkg with gpg signing diff --git a/mk/build.mk b/mk/build.mk index 77b70a3f8..07fcbc793 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -544,7 +544,7 @@ endif # ! ifeq ($(strip $(ADK_HAVE_DOT_CONFIG)),y) # build all target architecture and libc combinations (toolchain only) bulktoolchain: - for libc in uclibc eglibc glibc;do \ + for libc in uclibc eglibc glibc musl;do \ while read arch; do \ mkdir -p $(TOPDIR)/bin/toolchain_$${arch}_$$libc; \ ( \ diff --git a/mk/kernel-ver.mk b/mk/kernel-ver.mk index ae4a99069..34c639a62 100644 --- a/mk/kernel-ver.mk +++ b/mk/kernel-ver.mk @@ -1,8 +1,8 @@ ifeq ($(ADK_KERNEL_VERSION_TOOLCHAIN),y) -KERNEL_VERSION:= 3.11.10 +KERNEL_VERSION:= 3.12.6 KERNEL_MOD_VERSION:= $(KERNEL_VERSION) KERNEL_RELEASE:= 1 -KERNEL_MD5SUM:= 59f352d3f4e2cdf6755f79e09fa09176 +KERNEL_MD5SUM:= ab2fcc368e20d804e77970196154fb9e endif ifeq ($(ADK_KERNEL_VERSION_3_12_6),y) KERNEL_VERSION:= 3.12.6 diff --git a/mk/modules.mk b/mk/modules.mk index f5660ba97..00667de3e 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -1736,3 +1736,14 @@ $(eval $(call KMOD_template,SCx200_ACB,scx200-acb,\ $(MODULES_DIR)/kernel/drivers/i2c/busses/scx200_acb \ ,25)) +# +# VirtIO +# +$(eval $(call KMOD_template,VIRTIO_BLK,virtio-block,\ + $(MODULES_DIR)/kernel/drivers/net/virtio_blk \ +,20)) + +$(eval $(call KMOD_template,VIRTIO_NET,virtio-net,\ + $(MODULES_DIR)/kernel/drivers/net/virtio_net \ +,40)) + diff --git a/mk/rootfs.mk b/mk/rootfs.mk index f1d0bdf3a..5ec5f3107 100644 --- a/mk/rootfs.mk +++ b/mk/rootfs.mk @@ -13,6 +13,9 @@ MTDDEV:= root=/dev/mtdblock0 ifeq ($(ADK_TARGET_ROOTFS_ARCHIVE),y) ROOTFS:= root=/dev/sda1 endif +ifeq ($(ADK_TARGET_QEMU_WITH_VIRTIO),y) +ROOTFS:= root=/dev/vda1 +endif endif ifeq ($(ADK_TARGET_SYSTEM_MIKROTIK_RB532),y) diff --git a/mk/vars.mk b/mk/vars.mk index 014017ee8..bc6689cb8 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -82,7 +82,7 @@ TARGET_CFLAGS_LIBC:= $(TARGET_CFLAGS_ARCH) -fwrapv -fno-ident -fhonour-copts $(T endif TARGET_CXXFLAGS:= $(TARGET_CFLAGS_ARCH) -fwrapv -fno-ident TARGET_LDFLAGS:= -L$(STAGING_TARGET_DIR)/lib -L$(STAGING_TARGET_DIR)/usr/lib \ - -Wl,-O2 -Wl,-rpath -Wl,/usr/lib \ + -Wl,-O1 -Wl,-rpath -Wl,/usr/lib \ -Wl,-rpath-link -Wl,${STAGING_TARGET_DIR}/usr/lib \ $(ADK_TARGET_ABI_LDFLAGS) $(TARGET_CFLAGS_ARCH) # security optimization, see http://www.akkadia.org/drepper/dsohowto.pdf diff --git a/package/base-files/Makefile b/package/base-files/Makefile index 10e914178..06b4ce766 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:= 64 +PKG_RELEASE:= 65 PKG_SECTION:= base PKG_DESCR:= basic files and scripts PKG_BUILDDEP:= pkgconf-host file-host @@ -95,6 +95,12 @@ ifneq (${ADK_PACKAGE_CONFIG_IN_ETC},) endif ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI),y) echo 'export LD_LIBRARY_PATH=/opt/vc/lib' >> $(IDIR_BASE_FILES)/etc/profile +ifneq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI)$(ADK_TARGET_SYSTEM_IBM_X40)$(ADK_TARGET_SYSTEM_LEMOTE_YEELONG),) + echo 'export IPKGTMPDIR=/root/.ipkg' >> $(IDIR_BASE_FILES)/etc/profile +else + echo 'export IPKGTMPDIR=/tmp >> $(IDIR_BASE_FILES)/etc/profile +endif + endif # simple network configuration diff --git a/package/bcm2835-firmware/Makefile b/package/bcm2835-bootloader/Makefile index a67d1a3ad..8cd28cdd3 100644 --- a/package/bcm2835-firmware/Makefile +++ b/package/bcm2835-bootloader/Makefile @@ -3,27 +3,28 @@ include ${TOPDIR}/rules.mk -PKG_NAME:= bcm2835-firmware +PKG_NAME:= bcm2835-bootloader # actually f46e6d9cb9a6bf419fe2a428a8a586239e93aa2d from 07.01.2014 +# https://github.com/raspberrypi/firmware PKG_VERSION:= 0.6 PKG_RELEASE:= 1 -PKG_MD5SUM:= e4c1b8f3dd13ae8742a7831c19d212b0 -PKG_DESCR:= firmware for raspberry pi (bcm2835) -PKG_SECTION:= base +PKG_MD5SUM:= dba84ce20fc8a8c1bf473758d9350e19 +PKG_DESCR:= bootloader for raspberry pi (bcm2835) +PKG_SECTION:= boot PKG_SITES:= http://openadk.org/distfiles/ PKG_SYSTEM_DEPENDS:= raspberry-pi include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,BCM2835_FIRMWARE,bcm2835-firmware,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,BCM2835_BOOTLOADER,bcm2835-bootloader,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIG_STYLE:= manual BUILD_STYLE:= manual INSTALL_STYLE:= manual do-install: - ${INSTALL_DIR} ${IDIR_BCM2835_FIRMWARE}/boot - ${CP} ${WRKBUILD}/boot/* ${IDIR_BCM2835_FIRMWARE}/boot/ + ${INSTALL_DIR} ${IDIR_BCM2835_BOOTLOADER}/boot + ${CP} ${WRKBUILD}/boot/* ${IDIR_BCM2835_BOOTLOADER}/boot/ include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/boost/Makefile b/package/boost/Makefile index d5f4325fc..2951c1e8c 100644 --- a/package/boost/Makefile +++ b/package/boost/Makefile @@ -5,10 +5,11 @@ include ${TOPDIR}/rules.mk PKG_NAME:= boost PKG_VERSION:= 1.55.0 -PKG_RELEASE:= 2 +PKG_RELEASE:= 4 PKG_MD5SUM:= 93780777cfbf999a600f62883bd54b17 PKG_DESCR:= boost C++ library PKG_SECTION:= libs +PKG_BUILDDEP:= autotool bzip2-host python2-host PKG_URL:= http://www.boost.org/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=boost/} PKG_OPTS:= dev @@ -18,24 +19,24 @@ PKG_ARCH_DEPENDS:= !m68k DISTFILES:= boost_1_55_0.tar.gz WRKDIST= ${WRKDIR}/${PKG_NAME}_1_55_0 -PKG_FLAVOURS_BOOST:= date_time graph graph_parallel iostreams math program_options python regex serialization signals system test thread wave - -PKGFD_date_time:= with date-time -PKGFD_python:= with Python -PKGFB_python:= python2 -PKGFS_python:= python2 -PKGFD_iostreams:= with iostreams -PKGFD_graph:= with graph -PKGFD_graph_parallel:= with graph_parallel -PKGFD_math:= with math -PKGFD_program_options:= with program_options -PKGFD_regex:= with regex -PKGFD_serialization:= with serialization -PKGFD_signals:= with signals -PKGFD_system:= with system -PKGFD_test:= with test -PKGFD_thread:= with thread -PKGFD_wave:= with wave +PKG_FLAVOURS_BOOST:= DATE_TIME GRAPH GRAPH_PARALLEL IOSTREAMS MATH PROGRAM_OPTIONS PYTHON REGEX SERIALIZATION SIGNALS SYSTEM TEST THREAD WAVE + +PKGFD_DATE_TIME:= with date-time +PKGFD_PYTHON:= with Python +PKGFB_PYTHON:= python2 +PKGFS_PYTHON:= python2 +PKGFD_IOSTREAMS:= with iostreams +PKGFD_GRAPH:= with graph +PKGFD_GRAPH_PARALLEL:= with graph_parallel +PKGFD_MATH:= with math +PKGFD_PROGRAM_OPTIONS:= with program_options +PKGFD_REGEX:= with regex +PKGFD_SERIALIZATION:= with serialization +PKGFD_SIGNALS:= with signals +PKGFD_SYSTEM:= with system +PKGFD_TEST:= with test +PKGFD_THREAD:= with thread +PKGFD_WAVE:= with wave include ${TOPDIR}/mk/package.mk @@ -107,7 +108,7 @@ endif GPP_PATH:= ${STAGING_HOST_DIR}/bin/${GNU_TARGET_NAME}-g++ GPP_VERSION:= "`${GPP_PATH} -v 2>&1 | tail -1 | awk '{print $$3}'`" BJAM_PATH:= "`find ${WRKBUILD} -type f -name "bjam$(EXEEXT)"`" -PYTHON_PATH:= ${STAGING_TARGET_DIR}/usr/bin/python +PYTHON_PATH:= ${STAGING_HOST_DIR}/usr/bin/python PYTHON_INCLUDE:="`find ${STAGING_TARGET_DIR}/usr/include/ -maxdepth 1 -type d -name "python*" | head -1`" PYTHON_LIB:= "`find ${STAGING_TARGET_DIR}/usr/lib/ -maxdepth 1 -type d -name "python*" | head -1`" USER_JAM:= ${WRKBUILD}/tools/build/v2/user-config.jam @@ -141,6 +142,7 @@ endif --layout=versioned \ --disable-long-double \ --without-mpi \ + --debug-configuration \ ${CONFIGURE_ARGS} \ install \ ) diff --git a/package/busybox/Makefile b/package/busybox/Makefile index 1d50365e3..d4184a37a 100644 --- a/package/busybox/Makefile +++ b/package/busybox/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= busybox PKG_VERSION:= 1.21.1 -PKG_RELEASE:= 3 +PKG_RELEASE:= 4 PKG_MD5SUM:= 795394f83903b5eec6567d51eebb417e PKG_DESCR:= core utilities for embedded systems PKG_SECTION:= base diff --git a/package/busybox/patches/001-ipkg.patch b/package/busybox/patches/001-ipkg.patch index 07d31b802..5f392d06b 100644 --- a/package/busybox/patches/001-ipkg.patch +++ b/package/busybox/patches/001-ipkg.patch @@ -1,6 +1,6 @@ diff -Nur busybox-1.21.1.orig/archival/Config.src busybox-1.21.1/archival/Config.src --- busybox-1.21.1.orig/archival/Config.src 2013-05-12 01:30:43.000000000 +0200 -+++ busybox-1.21.1/archival/Config.src 2013-11-02 15:26:12.000000000 +0100 ++++ busybox-1.21.1/archival/Config.src 2014-02-17 14:25:39.802534016 +0100 @@ -214,6 +214,12 @@ are actually slower than gzip at equivalent compression ratios and take up 3.2K of code. @@ -16,7 +16,7 @@ diff -Nur busybox-1.21.1.orig/archival/Config.src busybox-1.21.1/archival/Config default y diff -Nur busybox-1.21.1.orig/archival/ipkg.c busybox-1.21.1/archival/ipkg.c --- busybox-1.21.1.orig/archival/ipkg.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.21.1/archival/ipkg.c 2013-11-02 15:26:12.000000000 +0100 ++++ busybox-1.21.1/archival/ipkg.c 2014-02-17 14:25:39.802534016 +0100 @@ -0,0 +1,28 @@ +/* ipkg.c - the itsy package management system + @@ -48,7 +48,7 @@ diff -Nur busybox-1.21.1.orig/archival/ipkg.c busybox-1.21.1/archival/ipkg.c +} diff -Nur busybox-1.21.1.orig/archival/Kbuild.src busybox-1.21.1/archival/Kbuild.src --- busybox-1.21.1.orig/archival/Kbuild.src 2013-05-12 01:30:43.000000000 +0200 -+++ busybox-1.21.1/archival/Kbuild.src 2013-11-02 15:26:12.000000000 +0100 ++++ busybox-1.21.1/archival/Kbuild.src 2014-02-17 14:25:39.802534016 +0100 @@ -22,6 +22,7 @@ lib-$(CONFIG_LZOP) += lzop.o bbunzip.o lib-$(CONFIG_GZIP) += gzip.o bbunzip.o @@ -59,7 +59,7 @@ diff -Nur busybox-1.21.1.orig/archival/Kbuild.src busybox-1.21.1/archival/Kbuild lib-$(CONFIG_UNLZMA) += bbunzip.o diff -Nur busybox-1.21.1.orig/archival/libarchive/Kbuild.src busybox-1.21.1/archival/libarchive/Kbuild.src --- busybox-1.21.1.orig/archival/libarchive/Kbuild.src 2013-06-29 16:58:06.000000000 +0200 -+++ busybox-1.21.1/archival/libarchive/Kbuild.src 2013-11-02 15:26:12.000000000 +0100 ++++ busybox-1.21.1/archival/libarchive/Kbuild.src 2014-02-17 14:25:39.802534016 +0100 @@ -25,14 +25,14 @@ \ data_align.o \ @@ -79,7 +79,7 @@ diff -Nur busybox-1.21.1.orig/archival/libarchive/Kbuild.src busybox-1.21.1/arch diff -Nur busybox-1.21.1.orig/archival/libipkg/args.c busybox-1.21.1/archival/libipkg/args.c --- busybox-1.21.1.orig/archival/libipkg/args.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.21.1/archival/libipkg/args.c 2013-11-02 15:26:12.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/args.c 2014-02-17 14:25:39.826534090 +0100 @@ -0,0 +1,242 @@ +/* args.c - parse command-line args + @@ -325,7 +325,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/args.c busybox-1.21.1/archival/li +} diff -Nur busybox-1.21.1.orig/archival/libipkg/args.h busybox-1.21.1/archival/libipkg/args.h --- busybox-1.21.1.orig/archival/libipkg/args.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.21.1/archival/libipkg/args.h 2013-11-02 15:26:12.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/args.h 2014-02-17 14:25:39.826534090 +0100 @@ -0,0 +1,72 @@ +/* args.h - parse command-line args + @@ -401,7 +401,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/args.h busybox-1.21.1/archival/li +#endif diff -Nur busybox-1.21.1.orig/archival/libipkg/conffile.c busybox-1.21.1/archival/libipkg/conffile.c --- busybox-1.21.1.orig/archival/libipkg/conffile.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.21.1/archival/libipkg/conffile.c 2013-11-02 15:26:12.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/conffile.c 2014-02-17 14:25:39.826534090 +0100 @@ -0,0 +1,65 @@ +/* conffile.c - the itsy package management system + @@ -470,7 +470,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/conffile.c busybox-1.21.1/archiva +} diff -Nur busybox-1.21.1.orig/archival/libipkg/conffile.h busybox-1.21.1/archival/libipkg/conffile.h --- busybox-1.21.1.orig/archival/libipkg/conffile.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.21.1/archival/libipkg/conffile.h 2013-11-02 15:26:12.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/conffile.h 2014-02-17 14:25:39.826534090 +0100 @@ -0,0 +1,30 @@ +/* conffile.h - the itsy package management system + @@ -504,7 +504,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/conffile.h busybox-1.21.1/archiva + diff -Nur busybox-1.21.1.orig/archival/libipkg/conffile_list.c busybox-1.21.1/archival/libipkg/conffile_list.c --- busybox-1.21.1.orig/archival/libipkg/conffile_list.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.21.1/archival/libipkg/conffile_list.c 2013-11-02 15:26:12.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/conffile_list.c 2014-02-17 14:25:39.850534164 +0100 @@ -0,0 +1,47 @@ +/* conffile_list.c - the itsy package management system + @@ -555,7 +555,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/conffile_list.c busybox-1.21.1/ar |