summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore2
-rw-r--r--TODO5
-rw-r--r--mk/build.mk17
-rw-r--r--mk/vars.mk19
-rw-r--r--package/boost/Makefile4
-rw-r--r--package/kexec-tools/Makefile2
-rw-r--r--package/kexec-tools/patches/patch-kexec_kexec_c6
-rw-r--r--package/kexec-tools/patches/patch-vmcore-dmesg_vmcore-dmesg_c41
-rw-r--r--package/sane-backends/Makefile5
-rw-r--r--package/sane-backends/patches/patch-backend_canon630u-common_c12
-rw-r--r--package/sane-backends/patches/patch-backend_epson2-commands_c10
-rw-r--r--package/sane-backends/patches/patch-backend_genesys_c10
-rw-r--r--package/sane-backends/patches/patch-backend_genesys_h10
-rw-r--r--package/sane-backends/patches/patch-backend_genesys_low_c10
-rw-r--r--package/sane-backends/patches/patch-backend_hp3900_rts8822_c10
-rw-r--r--package/sane-backends/patches/patch-backend_hp5400_sanei_c10
-rw-r--r--package/sane-backends/patches/patch-backend_hp5590_low_c10
-rw-r--r--package/sane-backends/patches/patch-backend_kvs20xx_opt_c10
-rw-r--r--package/sane-backends/patches/patch-backend_rts88xx_lib_c10
-rw-r--r--package/sane-backends/patches/patch-backend_xerox_mfp_c10
-rw-r--r--package/sane-backends/patches/patch-include_sane_sanei_tcp_h10
-rw-r--r--package/sane-backends/patches/patch-include_sane_sanei_udp_h10
-rw-r--r--package/tzdata/Makefile10
-rw-r--r--scripts/rstrip.sh3
-rw-r--r--target/arm/sys-available/toolchain-arm3
-rw-r--r--target/arm/sys-available/toolchain-armhf3
-rw-r--r--toolchain/Makefile8
-rw-r--r--toolchain/binutils/Makefile2
-rw-r--r--toolchain/gcc/Makefile41
-rw-r--r--toolchain/glibc/Makefile2
-rw-r--r--toolchain/gmp/Makefile5
-rw-r--r--toolchain/libelf/Makefile2
-rw-r--r--toolchain/mpc/Makefile4
-rw-r--r--toolchain/mpfr/Makefile2
34 files changed, 248 insertions, 70 deletions
diff --git a/.gitignore b/.gitignore
index fc81d7882..55f82fdd7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,7 +16,7 @@
/tests/adk.exp
/tests/adk.exp.in.tmp
/prereq.mk
-/toolchain_build_*/
+/toolchain_*/
/.ADK_HAVE_DOT_CONFIG
/.tmpconfig.h
/.prereq_done
diff --git a/TODO b/TODO
index b53457e67..d3a55ea0b 100644
--- a/TODO
+++ b/TODO
@@ -1,14 +1,11 @@
-- tzdata split + update
+- check gold for mozilla compile
- getty + serial rework
- add daemon() function to functions.sh
- add printing of OK/FAIL (optional verbose bootup)
- fixup rework libgcc --export-symbols
- libgcc static?
-- remove 32 bit kernel for 64 bit targets
- static toolchain support
- toolchain in /usr , check gcj
-- rework startup, maybe use init.c, start gettys after bootup ready
-- more output for initscripts on bootup
- try Preset Loops per Jiffy for faster bootup via lpj=
- port uuterm
- hash-style=gnu for non-mips and non-musl
diff --git a/mk/build.mk b/mk/build.mk
index bce09defe..ff9abd229 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -170,6 +170,9 @@ endif
${STAGING_TARGET_DIR} ${STAGING_TARGET_DIR}/etc ${STAGING_HOST_DIR}:
mkdir -p ${STAGING_TARGET_DIR}/{bin,etc,lib,usr/bin,usr/include,usr/lib/pkgconfig} \
${STAGING_HOST_DIR}/{bin,lib,usr/bin,usr/lib,usr/include}
+ for i in lib64 lib32 libx32;do \
+ cd ${STAGING_TARGET_DIR}/; ln -sf lib $$i; \
+ done
${STAGING_TARGET_DIR}/etc/ipkg.conf: ${STAGING_TARGET_DIR}/etc
ifeq ($(ADK_TARGET_PACKAGE_IPKG),y)
@@ -261,7 +264,7 @@ cleandir:
@$(MAKE) -C $(CONFIG) clean $(MAKE_TRACE)
rm -rf $(BUILD_DIR_PFX) $(FW_DIR_PFX) $(TARGET_DIR_PFX) \
${TOPDIR}/package/pkglist.d ${TOPDIR}/package/pkgconfigs.d
- rm -rf $(TOOLCHAIN_BUILD_DIR_PFX) $(STAGING_HOST_DIR_PFX) $(TOOLS_BUILD_DIR)
+ rm -rf $(TOOLCHAIN_DIR_PFX) $(STAGING_HOST_DIR_PFX) $(TOOLS_BUILD_DIR)
rm -rf $(STAGING_TARGET_DIR_PFX) $(STAGING_PKG_DIR_PFX)
rm -f .menu .tmpconfig.h .rebuild* ${TOPDIR}/package/Depends.mk ${TOPDIR}/prereq.mk
@@ -269,16 +272,16 @@ cleantoolchain:
@$(TRACE) cleantoolchain
@rm -rf $(BUILD_DIR_PFX) $(TARGET_DIR_PFX) \
${TOPDIR}/package/pkglist.d ${TOPDIR}/package/pkgconfigs.d
- @rm -rf $(TOOLCHAIN_BUILD_DIR_PFX) $(STAGING_HOST_DIR_PFX) $(TOOLS_BUILD_DIR)
+ @rm -rf $(TOOLCHAIN_DIR_PFX) $(STAGING_HOST_DIR_PFX) $(TOOLS_BUILD_DIR)
@rm -rf $(STAGING_TARGET_DIR_PFX) $(STAGING_PKG_DIR_PFX)
@rm -f .menu .tmpconfig.h .rebuild* ${TOPDIR}/package/Depends.mk
distclean:
@$(TRACE) distclean
@$(MAKE) -C $(CONFIG) clean $(MAKE_TRACE)
- @rm -rf $(BUILD_DIR_PFX) $(FW_DIR_PFX) $(TARGET_DIR_PFX) $(DISTDIR) \
+ @rm -rf $(BUILD_DIR_PFX) $(FW_DIR_PFX) $(TARGET_DIR_PFX) $(DL_DIR) \
${TOPDIR}/package/pkglist.d ${TOPDIR}/package/pkgconfigs.d
- @rm -rf $(TOOLCHAIN_BUILD_DIR_PFX) $(STAGING_HOST_DIR_PFX) $(TOOLS_BUILD_DIR)
+ @rm -rf $(TOOLCHAIN_DIR_PFX) $(STAGING_HOST_DIR_PFX) $(TOOLS_BUILD_DIR)
@rm -rf $(STAGING_TARGET_DIR_PFX) $(STAGING_PKG_DIR_PFX)
@rm -f .adkinit .config* .defconfig .tmpconfig.h all.config ${TOPDIR}/prereq.mk \
.menu ${TOPDIR}/package/Depends.mk .ADK_HAVE_DOT_CONFIG .rebuild.*
@@ -449,9 +452,9 @@ _mconfig2: ${CONFIG}/conf modconfig .menu
distclean:
@$(MAKE) -C $(CONFIG) clean
- @rm -rf $(BUILD_DIR_PFX) $(FW_DIR_PFX) $(TARGET_DIR_PFX) $(DISTDIR) \
+ @rm -rf $(BUILD_DIR_PFX) $(FW_DIR_PFX) $(TARGET_DIR_PFX) $(DL_DIR) \
${TOPDIR}/package/pkglist.d ${TOPDIR}/package/pkgconfigs.d
- @rm -rf $(TOOLCHAIN_BUILD_DIR_PFX) $(STAGING_TARGET_DIR_PFX) $(TOOLS_BUILD_DIR)
+ @rm -rf $(TOOLCHAIN_DIR_PFX) $(STAGING_TARGET_DIR_PFX) $(TOOLS_BUILD_DIR)
@rm -rf $(STAGING_HOST_DIR_PFX) $(STAGING_TARGET_DIR_PFX) $(STAGING_PKG_DIR_PFX)
@rm -f .adkinit .config* .defconfig .tmpconfig.h all.config ${TOPDIR}/prereq.mk \
.menu .rebuild.* ${TOPDIR}/package/Depends.mk .ADK_HAVE_DOT_CONFIG
@@ -479,7 +482,7 @@ bulktoolchain:
if [ $$arch = "armhf" ];then arch=arm; else arch=$$arch;fi; \
tabi=$$(grep ^ADK_TARGET_ABI= .config|cut -d \" -f 2);\
if [ -z $$tabi ];then abi="";else abi=_$$tabi;fi; \
- tar -cvJf ${TOPDIR}/firmware/toolchain_$${arch}_$${libc}$${abi}.tar.xz host_* target_$${arch}_$${libc}$${abi}; \
+ tar -cvJf ${TOPDIR}/firmware/toolchain_$${arch}_$${libc}$${abi}.tar.xz toolchain_${GNU_HOST_NAME} target_$${arch}_$${libc}$${abi}; \
$(GMAKE) cleantoolchain; \
rm .config; \
) 2>&1 | tee $(TOPDIR)/firmware/toolchain_build.log; \
diff --git a/mk/vars.mk b/mk/vars.mk
index dc030f0ca..699f3eda4 100644
--- a/mk/vars.mk
+++ b/mk/vars.mk
@@ -20,13 +20,14 @@ endif
TOOLS_BUILD_DIR= $(BASE_DIR)/tools_build
SCRIPT_DIR:= $(BASE_DIR)/scripts
STAGING_HOST_DIR:= ${BASE_DIR}/host_${GNU_HOST_NAME}
+TOOLCHAIN_DIR:= ${BASE_DIR}/toolchain_${GNU_HOST_NAME}
# dirs for cleandir
FW_DIR_PFX:= $(BASE_DIR)/firmware
BUILD_DIR_PFX:= $(BASE_DIR)/build_*
STAGING_PKG_DIR_PFX:= ${BASE_DIR}/pkg_*
STAGING_TARGET_DIR_PFX:=${BASE_DIR}/target_*
-TOOLCHAIN_BUILD_DIR_PFX=$(BASE_DIR)/toolchain_build_*
+TOOLCHAIN_DIR_PFX= $(BASE_DIR)/toolchain_*
STAGING_HOST_DIR_PFX:= ${BASE_DIR}/host_*
TARGET_DIR_PFX:= $(BASE_DIR)/root_*
@@ -36,7 +37,7 @@ FW_DIR:= $(BASE_DIR)/firmware/${ADK_TARGET_SYSTEM}_${CPU_ARCH}_${ADK_TARGET_LIB
BUILD_DIR:= ${BASE_DIR}/build_${ADK_TARGET_SYSTEM}_${CPU_ARCH}_${ADK_TARGET_LIBC}
STAGING_TARGET_DIR:= ${BASE_DIR}/target_${CPU_ARCH}_${ADK_TARGET_LIBC}
STAGING_PKG_DIR:= ${BASE_DIR}/pkg_${ADK_TARGET_SYSTEM}_${CPU_ARCH}_${ADK_TARGET_LIBC}
-STAGING_HOST2TARGET:= ../target_${CPU_ARCH}_${ADK_TARGET_LIBC}
+STAGING_HOST2TARGET:= ../../target_${CPU_ARCH}_${ADK_TARGET_LIBC}
TOOLCHAIN_BUILD_DIR= $(BASE_DIR)/toolchain_build_${CPU_ARCH}_${ADK_TARGET_LIBC}
else
TARGET_DIR:= $(BASE_DIR)/root_${ADK_TARGET_SYSTEM}_${CPU_ARCH}_${ADK_TARGET_LIBC}_${ADK_TARGET_ABI}
@@ -44,7 +45,7 @@ FW_DIR:= $(BASE_DIR)/firmware/${ADK_TARGET_SYSTEM}_${CPU_ARCH}_${ADK_TARGET_LIB
BUILD_DIR:= ${BASE_DIR}/build_${ADK_TARGET_SYSTEM}_${CPU_ARCH}_${ADK_TARGET_LIBC}_${ADK_TARGET_ABI}
STAGING_TARGET_DIR:= ${BASE_DIR}/target_${CPU_ARCH}_${ADK_TARGET_LIBC}_${ADK_TARGET_ABI}
STAGING_PKG_DIR:= ${BASE_DIR}/pkg_${ADK_TARGET_SYSTEM}_${CPU_ARCH}_${ADK_TARGET_LIBC}_${ADK_TARGET_ABI}
-STAGING_HOST2TARGET:= ../target_${CPU_ARCH}_${ADK_TARGET_LIBC}_${ADK_TARGET_ABI}
+STAGING_HOST2TARGET:= ../../target_${CPU_ARCH}_${ADK_TARGET_LIBC}_${ADK_TARGET_ABI}
TOOLCHAIN_BUILD_DIR= $(BASE_DIR)/toolchain_build_${CPU_ARCH}_${ADK_TARGET_LIBC}_${ADK_TARGET_ABI}
endif
@@ -52,9 +53,9 @@ PACKAGE_DIR:= $(FW_DIR)/packages
SCRIPT_TARGET_DIR:= ${STAGING_TARGET_DIR}/scripts
# PATH variables
-TARGET_PATH= ${SCRIPT_DIR}:${STAGING_TARGET_DIR}/scripts:${STAGING_HOST_DIR}/bin:${STAGING_HOST_DIR}/usr/bin:${_PATH}
-HOST_PATH= ${SCRIPT_DIR}:${STAGING_HOST_DIR}/bin:${STAGING_HOST_DIR}/usr/bin:${_PATH}
-AUTOTOOL_PATH= ${STAGING_HOST_DIR}/bin:${STAGING_HOST_DIR}/usr/bin:${STAGING_TARGET_DIR}/scripts:${_PATH}
+TARGET_PATH= ${SCRIPT_DIR}:${STAGING_TARGET_DIR}/scripts:${TOOLCHAIN_DIR}/usr/bin:${STAGING_HOST_DIR}/usr/bin:${_PATH}
+HOST_PATH= ${SCRIPT_DIR}:${TOOLCHAIN_DIR}/bin:${STAGING_HOST_DIR}/usr/bin:${_PATH}
+AUTOTOOL_PATH= ${TOOLCHAIN_DIR}/usr/bin:${STAGING_HOST_DIR}/usr/bin:${STAGING_TARGET_DIR}/scripts:${_PATH}
ifeq ($(ADK_DISABLE_HONOUR_CFLAGS),)
GCC_CHECK:= GCC_HONOUR_COPTS=2
@@ -63,9 +64,11 @@ GCC_CHECK:=
endif
GNU_TARGET_NAME:= $(CPU_ARCH)-$(ADK_VENDOR)-linux-$(ADK_TARGET_SUFFIX)
-TARGET_CROSS:= $(STAGING_HOST_DIR)/bin/$(GNU_TARGET_NAME)-
+TARGET_CROSS:= $(TOOLCHAIN_DIR)/usr/bin/$(GNU_TARGET_NAME)-
TARGET_COMPILER_PREFIX?=${TARGET_CROSS}
-CONFIGURE_TRIPLE:= --build=${GNU_HOST_NAME} --host=${GNU_TARGET_NAME} --target=${GNU_TARGET_NAME}
+CONFIGURE_TRIPLE:= --build=${GNU_HOST_NAME} \
+ --host=${GNU_TARGET_NAME} \
+ --target=${GNU_TARGET_NAME}
ifneq ($(strip ${ADK_USE_CCACHE}),)
TARGET_COMPILER_PREFIX=ccache ${TARGET_CROSS}
diff --git a/package/boost/Makefile b/package/boost/Makefile
index a2a92df00..ab7b73097 100644
--- a/package/boost/Makefile
+++ b/package/boost/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= boost
PKG_VERSION:= 1.55.0
-PKG_RELEASE:= 4
+PKG_RELEASE:= 5
PKG_MD5SUM:= 93780777cfbf999a600f62883bd54b17
PKG_DESCR:= boost C++ library
PKG_SECTION:= libs
@@ -105,7 +105,7 @@ BOOST_ARCH:= $(ARCH)
endif
# some variables for build
-GPP_PATH:= ${STAGING_HOST_DIR}/bin/${GNU_TARGET_NAME}-g++
+GPP_PATH:= ${TOOLCHAIN_DIR}/usr/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_HOST_DIR}/usr/bin/python
diff --git a/package/kexec-tools/Makefile b/package/kexec-tools/Makefile
index 157d9db03..3ebdc2f6b 100644
--- a/package/kexec-tools/Makefile
+++ b/package/kexec-tools/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= kexec-tools
PKG_VERSION:= 2.0.5
-PKG_RELEASE:= 1
+PKG_RELEASE:= 3
PKG_MD5SUM:= da5887e30eec16895e9d98ef072dc257
PKG_DESCR:= kexec tools
PKG_SECTION:= misc
diff --git a/package/kexec-tools/patches/patch-kexec_kexec_c b/package/kexec-tools/patches/patch-kexec_kexec_c
index 68dc2bee9..8ce2ac370 100644
--- a/package/kexec-tools/patches/patch-kexec_kexec_c
+++ b/package/kexec-tools/patches/patch-kexec_kexec_c
@@ -1,6 +1,6 @@
---- kexec-tools-2.0.2.orig/kexec/kexec.c 2010-07-29 06:19:59.000000000 +0200
-+++ kexec-tools-2.0.2/kexec/kexec.c 2011-09-05 18:50:27.679232756 +0200
-@@ -796,17 +796,14 @@ int k_unload (unsigned long kexec_flags)
+--- kexec-tools-2.0.5.orig/kexec/kexec.c 2013-12-13 01:52:47.000000000 +0100
++++ kexec-tools-2.0.5/kexec/kexec.c 2014-03-18 14:46:58.000000000 +0100
+@@ -807,17 +807,14 @@ static int k_unload (unsigned long kexec
static int my_shutdown(void)
{
char *args[] = {
diff --git a/package/kexec-tools/patches/patch-vmcore-dmesg_vmcore-dmesg_c b/package/kexec-tools/patches/patch-vmcore-dmesg_vmcore-dmesg_c
new file mode 100644
index 000000000..5f6484789
--- /dev/null
+++ b/package/kexec-tools/patches/patch-vmcore-dmesg_vmcore-dmesg_c
@@ -0,0 +1,41 @@
+--- kexec-tools-2.0.5.orig/vmcore-dmesg/vmcore-dmesg.c 2014-01-15 00:51:14.000000000 +0100
++++ kexec-tools-2.0.5/vmcore-dmesg/vmcore-dmesg.c 2014-03-18 15:00:45.000000000 +0100
+@@ -26,14 +26,14 @@ static Elf64_Ehdr ehdr;
+ static Elf64_Phdr *phdr;
+
+ static char osrelease[4096];
+-static loff_t log_buf_vaddr;
+-static loff_t log_end_vaddr;
+-static loff_t log_buf_len_vaddr;
+-static loff_t logged_chars_vaddr;
++static off_t log_buf_vaddr;
++static off_t log_end_vaddr;
++static off_t log_buf_len_vaddr;
++static off_t logged_chars_vaddr;
+
+ /* record format logs */
+-static loff_t log_first_idx_vaddr;
+-static loff_t log_next_idx_vaddr;
++static off_t log_first_idx_vaddr;
++static off_t log_next_idx_vaddr;
+
+ /* struct log size */
+ static uint64_t log_sz;
+@@ -266,7 +266,7 @@ static void scan_vmcoreinfo(char *start,
+ const char *str;
+ const char *name;
+ size_t len;
+- loff_t *vaddr;
++ off_t *vaddr;
+ } symbol[] = {
+ SYMBOL(log_buf),
+ SYMBOL(log_end),
+@@ -344,7 +344,7 @@ static void scan_vmcoreinfo(char *start,
+ }
+ }
+
+-static void scan_notes(int fd, loff_t start, loff_t lsize)
++static void scan_notes(int fd, off_t start, off_t lsize)
+ {
+ char *buf, *last, *note, *next;
+ size_t size;
diff --git a/package/sane-backends/Makefile b/package/sane-backends/Makefile
index 4bad787ef..570febc37 100644
--- a/package/sane-backends/Makefile
+++ b/package/sane-backends/Makefile
@@ -5,12 +5,12 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= sane-backends
PKG_VERSION:= 1.0.22
-PKG_RELEASE:= 1
+PKG_RELEASE:= 3
PKG_MD5SUM:= fadf56a60f4776bfb24491f66b617cf5
PKG_DESCR:= Scanner access now easy
PKG_SECTION:= misc
PKG_DEPENDS:= libpthread
-PKG_BUILDDEP:= libpthread libusb
+PKG_BUILDDEP:= libpthread libusb libusb-compat
PKG_URL:= http://www.sane-project.org/
PKG_SITES:= ftp://ftp2.sane-project.org/pub/sane/${PKG_NAME}-${PKG_VERSION}/
PKG_MULTI:= 1
@@ -165,6 +165,7 @@ $(eval $(call PKG_mod_template,SANE_BACKEND_UMAX1220U,umax1220u))
$(eval $(call PKG_mod_template,SANE_BACKEND_UMAX_PP,umax_pp))
$(eval $(call PKG_mod_template,SANE_BACKEND_UMAX,umax))
+TARGET_CFLAGS+= -D_GNU_SOURCE
CONFIGURE_ENV+= ac_cv_func_ioperm=no have_libv4l1=no
CONFIGURE_ARGS+= --disable-translations \
--without-gphoto2 \
diff --git a/package/sane-backends/patches/patch-backend_canon630u-common_c b/package/sane-backends/patches/patch-backend_canon630u-common_c
new file mode 100644
index 000000000..d9acb4bf1
--- /dev/null
+++ b/package/sane-backends/patches/patch-backend_canon630u-common_c
@@ -0,0 +1,12 @@
+--- sane-backends-1.0.22.orig/backend/canon630u-common.c 2010-12-02 00:49:58.000000000 +0100
++++ sane-backends-1.0.22/backend/canon630u-common.c 2014-03-18 08:33:31.000000000 +0100
+@@ -58,9 +58,7 @@
+ #include <unistd.h> /* usleep */
+ #include <time.h>
+ #include <math.h> /* exp() */
+-#ifdef HAVE_OS2_H
+ #include <sys/types.h> /* mode_t */
+-#endif
+ #include <sys/stat.h>
+ #include "lm9830.h"
+
diff --git a/package/sane-backends/patches/patch-backend_epson2-commands_c b/package/sane-backends/patches/patch-backend_epson2-commands_c
new file mode 100644
index 000000000..3b2c46841
--- /dev/null
+++ b/package/sane-backends/patches/patch-backend_epson2-commands_c
@@ -0,0 +1,10 @@
+--- sane-backends-1.0.22.orig/backend/epson2-commands.c 2010-12-02 00:49:58.000000000 +0100
++++ sane-backends-1.0.22/backend/epson2-commands.c 2014-03-18 08:34:27.000000000 +0100
+@@ -19,6 +19,7 @@
+
+ #include "sane/config.h"
+
++#include <sys/types.h>
+ #include <byteorder.h>
+ #include <math.h>
+
diff --git a/package/sane-backends/patches/patch-backend_genesys_c b/package/sane-backends/patches/patch-backend_genesys_c
new file mode 100644
index 000000000..fc0398856
--- /dev/null
+++ b/package/sane-backends/patches/patch-backend_genesys_c
@@ -0,0 +1,10 @@
+--- sane-backends-1.0.22.orig/backend/genesys.c 2011-02-14 00:10:18.000000000 +0100
++++ sane-backends-1.0.22/backend/genesys.c 2014-03-18 08:36:00.000000000 +0100
+@@ -65,6 +65,7 @@
+ #include <errno.h>
+ #include <string.h>
+ #include <stdlib.h>
++#include <sys/types.h>
+ #include <unistd.h>
+ #include <math.h>
+
diff --git a/package/sane-backends/patches/patch-backend_genesys_h b/package/sane-backends/patches/patch-backend_genesys_h
new file mode 100644
index 000000000..efc830be1
--- /dev/null
+++ b/package/sane-backends/patches/patch-backend_genesys_h
@@ -0,0 +1,10 @@
+--- sane-backends-1.0.22.orig/backend/genesys.h 2011-01-16 02:01:28.000000000 +0100
++++ sane-backends-1.0.22/backend/genesys.h 2014-03-18 08:36:42.000000000 +0100
+@@ -52,6 +52,7 @@
+ */
+ #undef UNIT_TESTING
+
++#include <sys/types.h>
+ #include "genesys_low.h"
+
+ #define FREE_IFNOT_NULL(x) if(x!=NULL) { free(x); x=NULL;}
diff --git a/package/sane-backends/patches/patch-backend_genesys_low_c b/package/sane-backends/patches/patch-backend_genesys_low_c
new file mode 100644
index 000000000..430ab3791
--- /dev/null
+++ b/package/sane-backends/patches/patch-backend_genesys_low_c
@@ -0,0 +1,10 @@
+--- sane-backends-1.0.22.orig/backend/genesys_low.c 2011-02-14 00:10:18.000000000 +0100
++++ sane-backends-1.0.22/backend/genesys_low.c 2014-03-18 08:37:27.000000000 +0100
+@@ -46,6 +46,7 @@
+ #include <errno.h>
+ #include <string.h>
+ #include <stdlib.h>
++#include <sys/types.h>
+ #include <unistd.h>
+ #include <math.h>
+
diff --git a/package/sane-backends/patches/patch-backend_hp3900_rts8822_c b/package/sane-backends/patches/patch-backend_hp3900_rts8822_c
new file mode 100644
index 000000000..59b9b5a9b
--- /dev/null
+++ b/package/sane-backends/patches/patch-backend_hp3900_rts8822_c
@@ -0,0 +1,10 @@
+--- sane-backends-1.0.22.orig/backend/hp3900_rts8822.c 2010-12-02 00:49:58.000000000 +0100
++++ sane-backends-1.0.22/backend/hp3900_rts8822.c 2014-03-18 08:38:21.000000000 +0100
+@@ -64,6 +64,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h> /* bzero() */
++#include <sys/types.h>
+ #include <time.h> /* clock() */
+ #include <math.h> /* truncf() */
+ #include <ctype.h> /* tolower() */
diff --git a/package/sane-backends/patches/patch-backend_hp5400_sanei_c b/package/sane-backends/patches/patch-backend_hp5400_sanei_c
new file mode 100644
index 000000000..7f340d607
--- /dev/null
+++ b/package/sane-backends/patches/patch-backend_hp5400_sanei_c
@@ -0,0 +1,10 @@
+--- sane-backends-1.0.22.orig/backend/hp5400_sanei.c 2010-12-02 00:49:58.000000000 +0100
++++ sane-backends-1.0.22/backend/hp5400_sanei.c 2014-03-18 08:39:35.000000000 +0100
+@@ -56,6 +56,7 @@
+ #include "hp5400_xfer.h"
+ #include "hp5400_debug.h"
+ #include <stdio.h>
++#include <sys/types.h>
+ #include "../include/sane/sanei_usb.h"
+
+ #define CMD_INITBULK1 0x0087 /* send 0x14 */
diff --git a/package/sane-backends/patches/patch-backend_hp5590_low_c b/package/sane-backends/patches/patch-backend_hp5590_low_c
new file mode 100644
index 000000000..7812886dc
--- /dev/null
+++ b/package/sane-backends/patches/patch-backend_hp5590_low_c
@@ -0,0 +1,10 @@
+--- sane-backends-1.0.22.orig/backend/hp5590_low.c 2010-12-02 00:49:58.000000000 +0100
++++ sane-backends-1.0.22/backend/hp5590_low.c 2014-03-18 08:38:55.000000000 +0100
+@@ -46,6 +46,7 @@
+
+ #include <stdio.h>
+ #include <string.h>
++#include <sys/types.h>
+ #include <errno.h>
+ #ifdef HAVE_NETINET_IN_H
+ # include <netinet/in.h>
diff --git a/package/sane-backends/patches/patch-backend_kvs20xx_opt_c b/package/sane-backends/patches/patch-backend_kvs20xx_opt_c
new file mode 100644
index 000000000..253699d14
--- /dev/null
+++ b/package/sane-backends/patches/patch-backend_kvs20xx_opt_c
@@ -0,0 +1,10 @@
+--- sane-backends-1.0.22.orig/backend/kvs20xx_opt.c 2010-12-02 00:49:58.000000000 +0100
++++ sane-backends-1.0.22/backend/kvs20xx_opt.c 2014-03-18 08:41:24.000000000 +0100
+@@ -8,6 +8,7 @@
+
+ #include "../include/sane/config.h"
+
++#include <sys/types.h>
+ #include <string.h>
+
+ #define DEBUG_DECLARE_ONLY
diff --git a/package/sane-backends/patches/patch-backend_rts88xx_lib_c b/package/sane-backends/patches/patch-backend_rts88xx_lib_c
new file mode 100644
index 000000000..060f0a10e
--- /dev/null
+++ b/package/sane-backends/patches/patch-backend_rts88xx_lib_c
@@ -0,0 +1,10 @@
+--- sane-backends-1.0.22.orig/backend/rts88xx_lib.c 2010-12-02 00:49:58.000000000 +0100
++++ sane-backends-1.0.22/backend/rts88xx_lib.c 2014-03-18 08:42:41.000000000 +0100
+@@ -54,6 +54,7 @@
+
+ #include <stdio.h>
+ #include <sys/time.h>
++#include <sys/types.h>
+
+ #include "../include/_stdint.h"
+
diff --git a/package/sane-backends/patches/patch-backend_xerox_mfp_c b/package/sane-backends/patches/patch-backend_xerox_mfp_c
new file mode 100644
index 000000000..d58262197
--- /dev/null
+++ b/package/sane-backends/patches/patch-backend_xerox_mfp_c
@@ -0,0 +1,10 @@
+--- sane-backends-1.0.22.orig/backend/xerox_mfp.c 2010-12-02 00:49:58.000000000 +0100
++++ sane-backends-1.0.22/backend/xerox_mfp.c 2014-03-18 08:44:56.000000000 +0100
+@@ -22,6 +22,7 @@
+ #include <math.h>
+ #include <unistd.h>
+ #include <sys/time.h>
++#include <sys/types.h>
+ #include "../include/sane/sane.h"
+ #include "../include/sane/sanei.h"
+ #include "../include/sane/saneopts.h"
diff --git a/package/sane-backends/patches/patch-include_sane_sanei_tcp_h b/package/sane-backends/patches/patch-include_sane_sanei_tcp_h
new file mode 100644
index 000000000..4ba390003
--- /dev/null
+++ b/package/sane-backends/patches/patch-include_sane_sanei_tcp_h
@@ -0,0 +1,10 @@
+--- sane-backends-1.0.22.orig/include/sane/sanei_tcp.h 2010-12-02 00:49:58.000000000 +0100
++++ sane-backends-1.0.22/include/sane/sanei_tcp.h 2014-03-18 08:31:07.000000000 +0100
+@@ -20,6 +20,7 @@
+
+ #include <sane/sane.h>
+
++#include <sys/types.h>
+ #include <netinet/in.h>
+ #include <netdb.h>
+
diff --git a/package/sane-backends/patches/patch-include_sane_sanei_udp_h b/package/sane-backends/patches/patch-include_sane_sanei_udp_h
new file mode 100644
index 000000000..3d70edada
--- /dev/null
+++ b/package/sane-backends/patches/patch-include_sane_sanei_udp_h
@@ -0,0 +1,10 @@
+--- sane-backends-1.0.22.orig/include/sane/sanei_udp.h 2010-12-02 00:49:58.000000000 +0100
++++ sane-backends-1.0.22/include/sane/sanei_udp.h 2014-03-18 08:31:40.000000000 +0100
+@@ -20,6 +20,7 @@
+
+ #include <sane/sane.h>
+
++#include <sys/types.h>
+ #include <netinet/in.h>
+ #include <netdb.h>
+
diff --git a/package/tzdata/Makefile b/package/tzdata/Makefile
index dc038027f..8fd111b3d 100644
--- a/package/tzdata/Makefile
+++ b/package/tzdata/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= tzdata
PKG_VERSION:= 2013d
-PKG_RELEASE:= 2
+PKG_RELEASE:= 3
PKG_MD5SUM:= 65b6818162230fc02f86f293376c73df 4616a9560270f180eeb9a08540636890
PKG_DESCR:= Timezone data (/usr/share/zoneinfo)
PKG_SECTION:= utils
@@ -39,8 +39,12 @@ ALL_TARGET:= ALL
INSTALL_TARGET:= INSTALL
tzdata-install:
- $(INSTALL_DIR) $(IDIR_TZDATA)/usr/share $(IDIR_TZDATA)/etc
- $(CP) $(WRKINST)/usr/share/zoneinfo $(IDIR_TZDATA)/usr/share
+ $(INSTALL_DIR) $(IDIR_TZDATA)/usr/share/zoneinfo $(IDIR_TZDATA)/etc
+ cd ${WRKINST} && for f in UTC ${ADK_RUNTIME_TIMEZONE}; do \
+ test -s usr/share/zoneinfo/"$$f" || continue; \
+ echo usr/share/zoneinfo/"$$f" | \
+ ${STAGING_HOST_DIR}/usr/bin/cpio -pdu ${IDIR_TZDATA}/; \
+ done
tz=; cd $(IDIR_TZDATA)/usr/share/zoneinfo || exit 1; \
for f in UTC ${ADK_RUNTIME_TIMEZONE}; do \
test -s "$$f" || continue; \
diff --git a/scripts/rstrip.sh b/scripts/rstrip.sh
index 46a4586da..66aba0e9b 100644
--- a/scripts/rstrip.sh
+++ b/scripts/rstrip.sh
@@ -54,6 +54,9 @@ find $TARGETS -type f -a -exec file {} \; | \
S='kernel module' ;;
*ELF*shared\ object*,\ not\ stripped*)
S='shared object' ;;
+ *current\ ar\ archive*)
+ S='static library'
+ T="$T -S" ;;
*)
continue ;;
esac
diff --git a/target/arm/sys-available/toolchain-arm b/target/arm/sys-available/toolchain-arm
index c6bb00b43..23febc50e 100644
--- a/target/arm/sys-available/toolchain-arm
+++ b/target/arm/sys-available/toolchain-arm
@@ -7,5 +7,6 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_ARM
select ADK_eabi
select ADK_TOOLCHAIN
select ADK_TARGET_PACKAGE_TGZ
+ select ADK_CPU_CORTEX_A9
help
- ARM toolchain (soft float).
+ ARM toolchain (soft float) for Cortex A9.
diff --git a/target/arm/sys-available/toolchain-armhf b/target/arm/sys-available/toolchain-armhf
index 89383f44f..bf671481c 100644
--- a/target/arm/sys-available/toolchain-armhf
+++ b/target/arm/sys-available/toolchain-armhf
@@ -7,6 +7,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_ARMHF
select ADK_toolchain_armhf
select ADK_TOOLCHAIN
select ADK_TARGET_PACKAGE_TGZ
+ select ADK_CPU_CORTEX_A9
help
- ARM toolchain (hard float).
+ ARM toolchain (hard float) for Cortex A9.
diff --git a/toolchain/Makefile b/toolchain/Makefile
index db5f65fd5..c70ea9820 100644
--- a/toolchain/Makefile
+++ b/toolchain/Makefile
@@ -53,17 +53,11 @@ else
$(LIBC)-fixup: gcc-install
endif
-$(STAGING_HOST_DIR):
- @mkdir -p $(STAGING_HOST_DIR)/lib
- @mkdir -p $(STAGING_HOST_DIR)/include
- @mkdir -p $(STAGING_HOST_DIR)/$(GNU_TARGET_NAME)
- @ln -sf ../lib $(STAGING_HOST_DIR)/$(GNU_TARGET_NAME)/lib
-
%-download:
$(TRACE) toolchain/$(patsubst %-download,%,$@)/download
$(MAKE) -C $(patsubst %-download,%,$@) fetch
-%-prepare: $(STAGING_HOST_DIR)
+%-prepare:
$(TRACE) toolchain/$(patsubst %-prepare,%,$@)/prepare
@if test x"$(patsubst %-prepare,%,$@)" = x"$(LIBC)"; then \
$(MAKE) -C $(patsubst %-prepare,%,$@) prepare \
diff --git a/toolchain/binutils/Makefile b/toolchain/binutils/Makefile
index fc256c578..6a01f1c9a 100644
--- a/toolchain/binutils/Makefile
+++ b/toolchain/binutils/Makefile
@@ -34,7 +34,7 @@ $(WRKBUILD)/.headers:
$(WRKBUILD)/.configured:
(cd $(WRKBUILD); \
$(WRKBUILD)/configure \
- --prefix=$(STAGING_HOST_DIR) \
+ --prefix=$(TOOLCHAIN_DIR)/usr \
--target=$(GNU_TARGET_NAME) \
--with-sysroot=$(STAGING_TARGET_DIR) \
--disable-dependency-tracking \
diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile
index 475c90662..98e150f7a 100644
--- a/toolchain/gcc/Makefile
+++ b/toolchain/gcc/Makefile
@@ -8,14 +8,14 @@ TARGET_CFLAGS:= $(filter-out -fstack-protector,$(TARGET_CFLAGS))
include Makefile.inc
-GCC_CONFOPTS:= --prefix=$(STAGING_HOST_DIR) \
+GCC_CONFOPTS:= --prefix=$(TOOLCHAIN_DIR)/usr \
--with-bugurl="http://www.openadk.org/" \
--build=$(GNU_HOST_NAME) \
--host=$(GNU_HOST_NAME) \
--target=$(GNU_TARGET_NAME) \
- --with-gmp=$(STAGING_HOST_DIR) \
- --with-mpfr=$(STAGING_HOST_DIR) \
- --with-libelf=$(STAGING_HOST_DIR) \
+ --with-gmp=$(STAGING_HOST_DIR)/usr \
+ --with-mpfr=$(STAGING_HOST_DIR)/usr \
+ --with-libelf=$(STAGING_HOST_DIR)/usr \
--disable-__cxa_atexit \
--with-gnu-ld \
--with-gnu-as \
@@ -120,15 +120,17 @@ GCC_BUILD_DIR_FINAL:= $(WRKBUILD)-final
$(GCC_BUILD_DIR_MINIMAL)/.configured:
mkdir -p $(GCC_BUILD_DIR_MINIMAL)
# these symlinks are very important, do not remove
- rm -rf $(STAGING_HOST_DIR)/$(GNU_TARGET_NAME)/sys-include
- ln -sf ${STAGING_TARGET_DIR}/usr/include $(STAGING_HOST_DIR)/$(GNU_TARGET_NAME)/sys-include
- rm -rf ${STAGING_HOST_DIR}/$(GNU_TARGET_NAME)/lib
- ln -sf ${STAGING_TARGET_DIR}/lib $(STAGING_HOST_DIR)/$(GNU_TARGET_NAME)/lib
+ rm -rf $(TOOLCHAIN_DIR)/$(GNU_TARGET_NAME)/sys-include
+ ln -sf ${STAGING_TARGET_DIR}/usr/include \
+ $(TOOLCHAIN_DIR)/usr/$(GNU_TARGET_NAME)/sys-include
+ rm -rf ${TOOLCHAIN_DIR}/usr/$(GNU_TARGET_NAME)/lib
+ ln -sf ${STAGING_TARGET_DIR}/lib $(TOOLCHAIN_DIR)/usr/$(GNU_TARGET_NAME)/lib
ifeq ($(ADK_LINUX_SH),y)
(cd ${STAGING_TARGET_DIR}/ && ln -sf . m4 && ln -sf . m4-nofpu)
endif
- sed -i '/k prot/agcc_cv_libc_provides_ssp=yes' $(WRKBUILD)/gcc/configure
- cd $(GCC_BUILD_DIR_MINIMAL); PATH='$(TARGET_PATH)' \
+ $(SED) '/k prot/agcc_cv_libc_provides_ssp=yes' $(WRKBUILD)/gcc/configure
+ cd $(GCC_BUILD_DIR_MINIMAL); \
+ PATH='$(TARGET_PATH)' \
CFLAGS="-O0 -g0" \
CXXFLAGS="-O0 -g0" \
$(WRKBUILD)/configure \
@@ -151,7 +153,8 @@ $(WRKBUILD)/.headers: $(GCC_BUILD_DIR_MINIMAL)/.compiled
$(GCC_BUILD_DIR_INITIAL)/.configured:
mkdir -p $(GCC_BUILD_DIR_INITIAL)
- cd $(GCC_BUILD_DIR_INITIAL); PATH='$(TARGET_PATH)' \
+ cd $(GCC_BUILD_DIR_INITIAL); \
+ PATH='$(TARGET_PATH)' \
CFLAGS="-O0 -g0" \
CXXFLAGS="-O0 -g0" \
$(WRKBUILD)/configure \
@@ -174,7 +177,8 @@ $(WRKBUILD)/.configured: $(GCC_BUILD_DIR_INITIAL)/.compiled
$(GCC_BUILD_DIR_FINAL)/.configured:
mkdir -p $(GCC_BUILD_DIR_FINAL)
- cd $(GCC_BUILD_DIR_FINAL); PATH='$(TARGET_PATH)' \
+ cd $(GCC_BUILD_DIR_FINAL); \
+ PATH='$(TARGET_PATH)' \
$(WRKBUILD)/configure \
${GCC_CONFOPTS} \
${GCC_FINAL_CONFOPTS} \
@@ -192,19 +196,12 @@ $(WRKBUILD)/.installed: $(WRKBUILD)/.compiled
PATH='$(TARGET_PATH)' $(MAKE) -C $(GCC_BUILD_DIR_FINAL) install
# remove duplicate tools, convert hardlinks to symlinks
set -e; \
- cd $(STAGING_HOST_DIR)/$(GNU_TARGET_NAME)/bin; \
+ cd $(TOOLCHAIN_DIR)/usr/$(GNU_TARGET_NAME)/bin; \
for app in ar as c++ g++ gcc ld ld.bfd nm objcopy objdump ranlib strip; do \
ln -sf ../../bin/$(GNU_TARGET_NAME)-$${app} $${app}; \
done;
- (cd $(STAGING_HOST_DIR)/bin && \
+ (cd $(TOOLCHAIN_DIR)/usr/bin && \
ln -sf $(GNU_TARGET_NAME)-gcc $(GNU_TARGET_NAME)-gcc-${PKG_VERSION})
- # setup symlink, so that gcc/g++ find cc1plus
- (cd $(STAGING_HOST_DIR)/$(GNU_TARGET_NAME)/ && \
- ln -sf ../libexec .)
- # setup symlink, so that gcc/g++ find stddef.h
- (cd $(STAGING_HOST_DIR)/$(GNU_TARGET_NAME)/lib/ && \
- ln -sf ../../host_${CPU_ARCH}_${ADK_TARGET_LIBC}_${ADK_TARGET_SUFFIX}/lib/gcc .)
- # fix linking g++ apps with libtool
@-test -d $(STAGING_TARGET_DIR)/lib32 && \
cd $(STAGING_TARGET_DIR)/lib32 && \
ln -sf libstdc++.so.6.0.18 libstdc++.so && \
@@ -218,7 +215,7 @@ $(WRKBUILD)/.installed: $(WRKBUILD)/.compiled
ln -sf libstdc++.so.6.0.18 libstdc++.so && \
ln -sf libstdc++.so.6.0.18 libstdc++.so.6
# cleanup unneeded docs
- rm -rf $(STAGING_HOST_DIR)/share
+ rm -rf $(TOOLCHAIN_DIR)/usr/share
touch $@
include ${TOPDIR}/mk/toolchain.mk
diff --git a/toolchain/glibc/Makefile b/toolchain/glibc/Makefile
index 4af17c3d7..996f9dd87 100644
--- a/toolchain/glibc/Makefile
+++ b/toolchain/glibc/Makefile
@@ -76,7 +76,7 @@ $(WRKBUILD)/.fixup:
ifeq ($(ADK_TOOLCHAIN),y)
# strip target libs and host tools for toolchain builds
PATH="$(TARGET_PATH)" debug='0' prefix='${TARGET_CROSS}' ${BASH} ${SCRIPT_DIR}/rstrip.sh $(STAGING_TARGET_DIR)
- debug='0' prefix=' ' ${BASH} ${SCRIPT_DIR}/rstrip.sh $(STAGING_HOST_DIR)/bin $(STAGING_HOST_DIR)/$(GNU_TARGET_NAME)/
+ debug='0' prefix=' ' ${BASH} ${SCRIPT_DIR}/rstrip.sh $(TOOLCHAIN_DIR)/usr
endif
touch $@
diff --git a/toolchain/gmp/Makefile b/toolchain/gmp/Makefile
index 692216b97..3e6e6c626 100644
--- a/toolchain/gmp/Makefile
+++ b/toolchain/gmp/Makefile
@@ -15,9 +15,10 @@ $(WRKBUILD)/.configured:
ifneq ($(OStype),Darwin)
(cd $(WRKBUILD); cp configfsf.guess config.guess)
endif
- (cd $(WRKBUILD); PATH="$(STAGING_HOST_DIR)/usr/bin:$$PATH" \
+ (cd $(WRKBUILD); \
+ PATH="$(STAGING_HOST_DIR)/usr/bin:$$PATH" \
./configure \
- --prefix=$(STAGING_HOST_DIR) \
+ --prefix=$(STAGING_HOST_DIR)/usr \
--with-pic \
--disable-shared \
--enable-static \
diff --git a/toolchain/libelf/Makefile b/toolchain/libelf/Makefile
index c243cdd00..90bf4cb8d 100644
--- a/toolchain/libelf/Makefile
+++ b/toolchain/libelf/Makefile
@@ -14,7 +14,7 @@ $(WRKBUILD)/.headers:
$(WRKBUILD)/.configured:
(cd $(WRKBUILD); \
$(WRKBUILD)/configure \
- --prefix=$(STAGING_HOST_DIR) \
+ --prefix=$(STAGING_HOST_DIR)/usr \
--disable-nls \
--disable-shared \
--enable-static \
diff --git a/toolchain/mpc/Makefile b/toolchain/mpc/Makefile
index 81f5b151d..40e7f615e 100644
--- a/toolchain/mpc/Makefile
+++ b/toolchain/mpc/Makefile
@@ -14,8 +14,8 @@ $(WRKBUILD)/.headers:
$(WRKBUILD)/.configured:
(cd $(WRKBUILD); \
$(WRKBUILD)/configure \
- --prefix=$(STAGING_HOST_DIR) \
- --with-gmp=$(STAGING_HOST_DIR) \
+ --prefix=$(STAGING_HOST_DIR)/usr \
+ --with-gmp=$(STAGING_HOST_DIR)/usr \
--disable-shared \
--enable-static \
);
diff --git a/toolchain/mpfr/Makefile b/toolchain/mpfr/Makefile
index 019d14d77..954040b85 100644
--- a/toolchain/mpfr/Makefile
+++ b/toolchain/mpfr/Makefile
@@ -15,7 +15,7 @@ $(WRKBUILD)/.headers:
$(WRKBUILD)/.configured:
(cd $(WRKBUILD); \
$(WRKBUILD)/configure \
- --prefix=$(STAGING_HOST_DIR) \
+ --prefix=$(STAGING_HOST_DIR)/usr \
--with-gmp-build=$(GMP_BUILD_DIR) \
--disable-shared \
--enable-static \