diff options
author | Waldemar Brodkorb <mail@waldemar-brodkorb.de> | 2013-10-14 19:41:17 +0200 |
---|---|---|
committer | Waldemar Brodkorb <mail@waldemar-brodkorb.de> | 2013-10-14 19:41:17 +0200 |
commit | a7109eeb4cf3cc355cff24fb59c0d9cc06a14e8f (patch) | |
tree | f6a9baac03f7fab6aec612eb109782d6bebfe7f4 | |
parent | a1ac5da819c9b6c0424e9b267e9b414c61619e0b (diff) | |
parent | 1efc0be417682b594ce30e477daf5a6489ea5c64 (diff) |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
-rw-r--r-- | mk/build.mk | 11 | ||||
-rw-r--r-- | package/bcm2835-firmware/Makefile | 2 | ||||
-rw-r--r-- | package/boost/Makefile | 5 | ||||
-rw-r--r-- | package/eglibc/Makefile | 1 | ||||
-rw-r--r-- | package/glibc/Makefile | 1 | ||||
-rw-r--r-- | package/libmpeg2/Makefile | 2 | ||||
-rw-r--r-- | package/libmpeg2/patches/patch-configure | 11 | ||||
-rw-r--r-- | package/libvpx/Makefile | 7 | ||||
-rw-r--r-- | toolchain/kernel-headers/patches/3.9.11/cris-header.patch | 51 |
9 files changed, 70 insertions, 21 deletions
diff --git a/mk/build.mk b/mk/build.mk index 2251f499c..8f41ffd66 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -39,9 +39,8 @@ DEFCONFIG= ADK_DEBUG=n \ ADK_PACKAGE_GRUB=n \ ADK_PACKAGE_BASE_FILES=y \ ADK_PACKAGE_CRYPTINIT=n \ - ADK_PACKAGE_HEIMDAL=n \ + ADK_PACKAGE_HEIMDAL_SERVER=n \ ADK_PACKAGE_LIBHEIMDAL=n \ - ADK_PACKAGE_LIBHEIMDAL_CLIENT=n \ ADK_PACKAGE_PAM=n \ ADK_PACKAGE_PYTHON=n \ ADK_PACKAGE_VIRTINST=n \ @@ -578,9 +577,9 @@ bulktoolchain: # build all target architecture, target systems and libc combinations bulk: - for libc in uclibc eglibc glibc;do \ + for libc in uclibc eglibc glibc musl;do \ while read arch; do \ - systems=$$(./scripts/getsystems $$arch|grep -v toolchain|grep -v qemu); \ + systems=$$(./scripts/getsystems $$arch|grep -v toolchain|grep -v qemu-cris|grep -v foxboard-lx); \ for system in $$systems;do \ mkdir -p $(TOPDIR)/bin/$${system}_$${arch}_$$libc; \ ( \ @@ -598,7 +597,7 @@ bulk: bulkall: for libc in uclibc eglibc glibc musl;do \ while read arch; do \ - systems=$$(./scripts/getsystems $$arch| grep -v toolchain|grep -v qemu); \ + systems=$$(./scripts/getsystems $$arch| grep -v toolchain|grep -v qemu-cris|grep -v foxboard-lx); \ for system in $$systems;do \ mkdir -p $(TOPDIR)/bin/$${system}_$${arch}_$$libc; \ ( \ @@ -616,7 +615,7 @@ bulkall: bulkallmod: for libc in uclibc eglibc glibc musl;do \ while read arch; do \ - systems=$$(./scripts/getsystems $$arch| grep -v toolchain|grep -v qemu); \ + systems=$$(./scripts/getsystems $$arch| grep -v toolchain|grep -v qemu-cris|grep -v foxboard-lx); \ for system in $$systems;do \ mkdir -p $(TOPDIR)/bin/$${system}_$${arch}_$$libc; \ ( \ diff --git a/package/bcm2835-firmware/Makefile b/package/bcm2835-firmware/Makefile index 76735591e..f88910535 100644 --- a/package/bcm2835-firmware/Makefile +++ b/package/bcm2835-firmware/Makefile @@ -7,7 +7,7 @@ PKG_NAME:= bcm2835-firmware # actually 5113ce63be622e50c1b3ec309798e5d091d219ac from 12.10.2013 PKG_VERSION:= 0.4 PKG_RELEASE:= 1 -PKG_MD5SUM:= 6f6a186ac50ddcb1a9abe8c4d4432b92 +PKG_MD5SUM:= e7f4caa11f26d5af07ae45128b2ac328 PKG_DESCR:= firmware for raspberry pi (bcm2835) PKG_SECTION:= base PKG_SITES:= http://openadk.org/distfiles/ diff --git a/package/boost/Makefile b/package/boost/Makefile index d0ac60891..485582d47 100644 --- a/package/boost/Makefile +++ b/package/boost/Makefile @@ -9,15 +9,12 @@ PKG_RELEASE:= 2 PKG_MD5SUM:= efbfbff5a85a9330951f243d0a46e4b9 PKG_DESCR:= boost C++ library PKG_SECTION:= libs -PKG_BUILDDEP:= gettext-tiny PKG_URL:= http://www.boost.org/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=boost/} DISTFILES:= boost_1_54_0.tar.gz WRKDIST= ${WRKDIR}/${PKG_NAME}_1_54_0 -PKG_LIBC_DEPENDS:= eglibc glibc musl - PKG_SUBPKGS:= BOOST BOOST_DEV PKGSD_BOOST_DEV:= boost header files PKGSC_BOOST_DEV:= devel @@ -61,6 +58,8 @@ CONFIGURE_ARGS += \ --build=$(GNU_HOST_NAME) \ --prefix=${WRKINST}/usr \ +CONFIGURE_ARGS+=--without-locale + ifneq (${ADK_PACKAGE_BOOST_IOSTREAMS},) CONFIGURE_ARGS += -sNO_BZIP2=1 -sZLIB_INCLUDE=${STAGING_DIR}/usr/include -sZLIB_LIBPATH=${STAGING_DIR}/usr/lib else diff --git a/package/eglibc/Makefile b/package/eglibc/Makefile index 3261ba314..98c6b2de9 100644 --- a/package/eglibc/Makefile +++ b/package/eglibc/Makefile @@ -3,7 +3,6 @@ include $(TOPDIR)/rules.mk include $(TOPDIR)/toolchain/eglibc/Makefile.inc -include $(TOPDIR)/toolchain/eglibc/Makefile.multilib PKG_DESCR:= embedded GNU C library PKG_SECTION:= base diff --git a/package/glibc/Makefile b/package/glibc/Makefile index 7f0a1f8c7..a03a5c8bd 100644 --- a/package/glibc/Makefile +++ b/package/glibc/Makefile @@ -7,7 +7,6 @@ TARGET_CFLAGS:= $(filter-out -fstack-protector,$(TARGET_CFLAGS)) TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS)) include $(TOPDIR)/toolchain/glibc/Makefile.inc -include $(TOPDIR)/toolchain/glibc/Makefile.multilib PKG_DESCR:= GNU C library PKG_SECTION:= base diff --git a/package/libmpeg2/Makefile b/package/libmpeg2/Makefile index f10a34f34..6248b67ae 100644 --- a/package/libmpeg2/Makefile +++ b/package/libmpeg2/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= libmpeg2 PKG_VERSION:= 0.5.1 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 0f92c7454e58379b4a5a378485bbd8ef PKG_DESCR:= MPEG-1 & -2 decoding library PKG_SECTION:= libs diff --git a/package/libmpeg2/patches/patch-configure b/package/libmpeg2/patches/patch-configure new file mode 100644 index 000000000..ba7d65763 --- /dev/null +++ b/package/libmpeg2/patches/patch-configure @@ -0,0 +1,11 @@ +--- libmpeg2-0.5.1.orig/configure 2008-07-18 16:41:54.000000000 +0200 ++++ libmpeg2-0.5.1/configure 2013-10-14 15:39:35.000000000 +0200 +@@ -4722,7 +4722,7 @@ rm -f core conftest.err conftest.$ac_obj + { echo "$as_me:$LINENO: result: $ac_cv_try_cflags_ok" >&5 + echo "${ECHO_T}$ac_cv_try_cflags_ok" >&6; } + if test x"$ac_cv_try_cflags_ok" = x"yes"; then +- OPT_CFLAGS="$TRY_CFLAGS" ++ OPT_CFLAGS="" + else + : + fi diff --git a/package/libvpx/Makefile b/package/libvpx/Makefile index 73fd74f7b..e9e102f22 100644 --- a/package/libvpx/Makefile +++ b/package/libvpx/Makefile @@ -5,15 +5,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:= libvpx PKG_VERSION:= 1.1.0 -PKG_RELEASE:= 2 +PKG_RELEASE:= 3 PKG_MD5SUM:= 7ae163ac3196c79ec2f0904280078a45 PKG_DESCR:= VP8/VP9 codec library PKG_SECTION:= libs PKG_URL:= http://www.webmproject.org/about/ PKG_SITES:= http://webm.googlecode.com/files/ -PKG_SYSTEM_DEPENDS:= raspberry-pi sharp-zaurus ibm-x40 lemote-yeelong qemu-i686 - DISTFILES:= ${PKG_NAME}-v${PKG_VERSION}.tar.bz2 WRKDIST= $(WRKDIR)/${PKG_NAME}-v${PKG_VERSION} @@ -22,6 +20,9 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBVPX,libvpx,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIG_STYLE:= minimal +ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM),y) +CONFIGURE_ARGS+= --target=armv5te-linux-gcc +endif ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI),y) CONFIGURE_ARGS+= --target=armv6-linux-gcc endif diff --git a/toolchain/kernel-headers/patches/3.9.11/cris-header.patch b/toolchain/kernel-headers/patches/3.9.11/cris-header.patch index d00768ca4..24df09aa9 100644 --- a/toolchain/kernel-headers/patches/3.9.11/cris-header.patch +++ b/toolchain/kernel-headers/patches/3.9.11/cris-header.patch @@ -1,27 +1,68 @@ +diff -Nur linux-3.9.11.orig/arch/cris/include/arch-v10/arch/Kbuild linux-3.9.11/arch/cris/include/arch-v10/arch/Kbuild +--- linux-3.9.11.orig/arch/cris/include/arch-v10/arch/Kbuild 2013-07-21 02:16:17.000000000 +0200 ++++ linux-3.9.11/arch/cris/include/arch-v10/arch/Kbuild 2013-10-14 11:02:43.000000000 +0200 +@@ -1 +1,5 @@ + # CRISv10 arch ++header-y += ptrace.h ++header-y += user.h ++header-y += elf.h ++header-y += system.h diff -Nur linux-3.9.11.orig/arch/cris/include/asm/Kbuild linux-3.9.11/arch/cris/include/asm/Kbuild --- linux-3.9.11.orig/arch/cris/include/asm/Kbuild 2013-07-21 02:16:17.000000000 +0200 -+++ linux-3.9.11/arch/cris/include/asm/Kbuild 2013-10-11 21:26:30.000000000 +0200 -@@ -1,7 +1,6 @@ ++++ linux-3.9.11/arch/cris/include/asm/Kbuild 2013-10-13 18:34:22.000000000 +0200 +@@ -1,9 +1,11 @@ -header-y += arch-v10/ -header-y += arch-v32/ - +header-y += ../arch-v10/arch/ +header-y += ../arch-v32/arch/ ++header-y += elf.h ++header-y += user.h generic-y += clkdev.h generic-y += exec.h + generic-y += module.h + generic-y += trace_clock.h ++generic-y += user.h diff -Nur linux-3.9.11.orig/arch/cris/include/uapi/asm/Kbuild linux-3.9.11/arch/cris/include/uapi/asm/Kbuild --- linux-3.9.11.orig/arch/cris/include/uapi/asm/Kbuild 2013-07-21 02:16:17.000000000 +0200 -+++ linux-3.9.11/arch/cris/include/uapi/asm/Kbuild 2013-10-11 21:32:52.000000000 +0200 ++++ linux-3.9.11/arch/cris/include/uapi/asm/Kbuild 2013-10-13 16:18:43.000000000 +0200 @@ -1,8 +1,8 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm -header-y += arch-v10/ -header-y += arch-v32/ -+header-y += ../arch-v10/arch -+header-y += ../arch-v32/arch ++header-y += ../arch-v10/arch/ ++header-y += ../arch-v32/arch/ header-y += auxvec.h header-y += bitsperlong.h header-y += byteorder.h +diff -Nur linux-3.9.11.orig/include/uapi/asm-generic/Kbuild linux-3.9.11/include/uapi/asm-generic/Kbuild +--- linux-3.9.11.orig/include/uapi/asm-generic/Kbuild 2013-07-21 02:16:17.000000000 +0200 ++++ linux-3.9.11/include/uapi/asm-generic/Kbuild 2013-10-13 20:09:39.000000000 +0200 +@@ -34,3 +34,4 @@ + header-y += types.h + header-y += ucontext.h + header-y += unistd.h ++header-y += user.h +diff -Nur linux-3.9.11.orig/include/uapi/asm-generic/Kbuild.asm linux-3.9.11/include/uapi/asm-generic/Kbuild.asm +--- linux-3.9.11.orig/include/uapi/asm-generic/Kbuild.asm 2013-07-21 02:16:17.000000000 +0200 ++++ linux-3.9.11/include/uapi/asm-generic/Kbuild.asm 2013-10-13 18:42:03.000000000 +0200 +@@ -18,6 +18,7 @@ + header-y += ipcbuf.h + header-y += mman.h + header-y += msgbuf.h ++header-y += page.h + header-y += param.h + header-y += poll.h + header-y += posix_types.h +@@ -38,6 +39,7 @@ + header-y += termios.h + header-y += types.h + header-y += unistd.h ++header-y += user.h + + header-y += $(foreach hdr,$(opt-header), \ + $(if \ |