diff options
-rw-r--r-- | package/ant/Makefile | 10 | ||||
-rw-r--r-- | package/boost/Makefile | 6 | ||||
-rw-r--r-- | package/busybox/Makefile | 6 | ||||
-rw-r--r-- | package/busybox/patches/004-busybox-1.23.0-ash.patch | 34 | ||||
-rw-r--r-- | package/busybox/patches/005-busybox-1.23.0-modprobe.patch | 114 | ||||
-rw-r--r-- | package/busybox/patches/006-busybox-1.23.0-vi.patch | 49 | ||||
-rw-r--r-- | package/jamvm/Makefile | 35 | ||||
-rw-r--r-- | package/jamvm/patches/patch-ltmain_sh | 11 | ||||
-rw-r--r-- | package/jamvm/patches/patch-src_os_linux_os_c | 17 | ||||
-rw-r--r-- | package/jikes/Makefile | 10 | ||||
-rw-r--r-- | package/libxslt/Makefile | 4 | ||||
-rw-r--r-- | package/lvm/Makefile | 8 | ||||
-rw-r--r-- | package/lvm/patches/patch-make_tmpl_in | 11 | ||||
-rw-r--r-- | package/openjdk7/Makefile | 9 | ||||
-rw-r--r-- | package/u-boot-git/Makefile | 2 | ||||
-rw-r--r-- | target/arm/uclibc.config | 1 | ||||
-rw-r--r-- | target/config/Config.in.kernelversion.choice | 4 | ||||
-rw-r--r-- | target/linux/config/Config.in.ethernet | 1 | ||||
-rw-r--r-- | target/linux/patches/4.0.3/initramfs-nosizelimit.patch | 57 | ||||
-rw-r--r-- | target/linux/patches/4.0.3/startup.patch | 37 |
20 files changed, 135 insertions, 291 deletions
diff --git a/package/ant/Makefile b/package/ant/Makefile index a1cfbd567..35094fd2b 100644 --- a/package/ant/Makefile +++ b/package/ant/Makefile @@ -29,10 +29,12 @@ host-build: cd $(WRKBUILD)/lib/optional; wget http://openadk.org/distfiles/junit-4.9b2.jar; \ fi cp $(DL_DIR)/ecj*.jar $(WRKBUILD)/lib/optional/ecj.jar - cd ${WRKBUILD}; export BOOTJAVAC_OPTS="-bootclasspath $(STAGING_HOST_DIR)/usr/share/classpath/glibj.zip" \ - LD_LIBRARY_PATH=$(STAGING_HOST_DIR)/usr/lib:$(STAGING_HOST_DIR)/usr/lib64 \ - JAVA_HOME=$(STAGING_HOST_DIR)/usr/lib/jvm ; \ - $(BASH) build.sh + (cd ${WRKBUILD}; \ + export JAVA_HOME=$(STAGING_HOST_DIR)/usr/lib/jvm ;\ + export CLASSPATH=$(STAGING_HOST_DIR)/usr/lib/jvm/lib/tools.jar ;\ + export JAVAC=$(STAGING_HOST_DIR)/usr/bin/ecj ;\ + export JAVACMD=$(STAGING_HOST_DIR)/usr/bin/gij ;\ + $(BASH) ./build.sh) ant-hostinstall: cd $(WRKBUILD)/dist; \ diff --git a/package/boost/Makefile b/package/boost/Makefile index cfa9d80ce..91240a58a 100644 --- a/package/boost/Makefile +++ b/package/boost/Makefile @@ -4,10 +4,10 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= boost -PKG_VERSION:= 1.57.0 -PKG_EXTRAVER:= 1_57 +PKG_VERSION:= 1.58.0 +PKG_EXTRAVER:= 1_58 PKG_RELEASE:= 1 -PKG_HASH:= fea9c7472f7a52cec2a1640958145b2144bf17903a21db65b95efb6ae5817fa5 +PKG_HASH:= a004d9b3fa95e956383693b86fce1b68805a6f71c2e68944fa813de0fb8c8102 PKG_DESCR:= portable c++ library PKG_SECTION:= libs/misc PKG_BUILDDEP:= python2-host diff --git a/package/busybox/Makefile b/package/busybox/Makefile index 83f29985e..313acbfc9 100644 --- a/package/busybox/Makefile +++ b/package/busybox/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= busybox -PKG_VERSION:= 1.23.0 -PKG_RELEASE:= 3 -PKG_HASH:= 483ab594dd962ddbb332fd24e36ffdd6e36ac2182fbff055c56e1ca49fda09e4 +PKG_VERSION:= 1.23.2 +PKG_RELEASE:= 1 +PKG_HASH:= 05a6f9e21aad8c098e388ae77de7b2361941afa7157ef74216703395b14e319a PKG_DESCR:= core utilities for embedded systems PKG_SECTION:= base/apps PKG_BUILDDEP:= bzip2-host diff --git a/package/busybox/patches/004-busybox-1.23.0-ash.patch b/package/busybox/patches/004-busybox-1.23.0-ash.patch deleted file mode 100644 index fb494aa25..000000000 --- a/package/busybox/patches/004-busybox-1.23.0-ash.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- busybox-1.23.0/shell/ash.c -+++ busybox-1.23.0-ash/shell/ash.c -@@ -6746,6 +6746,14 @@ varvalue(char *name, int varflags, int f - len = strlen(p); - if (!(subtype == VSPLUS || subtype == VSLENGTH)) - memtodest(p, len, syntax, quotes); -+#if ENABLE_UNICODE_SUPPORT -+ if (subtype == VSLENGTH && len > 0) { -+ reinit_unicode_for_ash(); -+ if (unicode_status == UNICODE_ON) { -+ len = unicode_strlen(p); -+ } -+ } -+#endif - return len; - } - -@@ -6829,15 +6837,7 @@ evalvar(char *p, int flags, struct strli - varunset(p, var, 0, 0); - - if (subtype == VSLENGTH) { -- ssize_t n = varlen; -- if (n > 0) { -- reinit_unicode_for_ash(); -- if (unicode_status == UNICODE_ON) { -- const char *val = lookupvar(var); -- n = unicode_strlen(val); -- } -- } -- cvtnum(n > 0 ? n : 0); -+ cvtnum(varlen > 0 ? varlen : 0); - goto record; - } - diff --git a/package/busybox/patches/005-busybox-1.23.0-modprobe.patch b/package/busybox/patches/005-busybox-1.23.0-modprobe.patch deleted file mode 100644 index 5b28cdec5..000000000 --- a/package/busybox/patches/005-busybox-1.23.0-modprobe.patch +++ /dev/null @@ -1,114 +0,0 @@ ---- busybox-1.23.0/modutils/depmod.c -+++ busybox-1.23.0-modprobe/modutils/depmod.c -@@ -51,7 +51,11 @@ static int FAST_FUNC parse_module(const - - info->dnext = info->dprev = info; - info->name = xstrdup(fname + 2); /* skip "./" */ -- info->modname = xstrdup(filename2modname(fname, modname)); -+ info->modname = xstrdup( -+ filename2modname( -+ bb_get_last_path_component_nostrip(fname), -+ modname -+ )); - for (ptr = image; ptr < image + len - 10; ptr++) { - if (strncmp(ptr, "depends=", 8) == 0) { - char *u; -@@ -242,17 +246,18 @@ int depmod_main(int argc UNUSED_PARAM, c - if (!(option_mask32 & OPT_n)) - xfreopen_write("modules.alias", stdout); - for (m = modules; m != NULL; m = m->next) { -+ char modname[MODULE_NAME_LEN]; - const char *fname = bb_basename(m->name); -- int fnlen = strchrnul(fname, '.') - fname; -+ filename2modname(fname, modname); - while (m->aliases) { - /* Last word can well be m->modname instead, - * but depmod from module-init-tools 3.4 - * uses module basename, i.e., no s/-/_/g. - * (pathname and .ko.* are still stripped) - * Mimicking that... */ -- printf("alias %s %.*s\n", -+ printf("alias %s %s\n", - (char*)llist_pop(&m->aliases), -- fnlen, fname); -+ modname); - } - } - #endif -@@ -260,12 +265,13 @@ int depmod_main(int argc UNUSED_PARAM, c - if (!(option_mask32 & OPT_n)) - xfreopen_write("modules.symbols", stdout); - for (m = modules; m != NULL; m = m->next) { -+ char modname[MODULE_NAME_LEN]; - const char *fname = bb_basename(m->name); -- int fnlen = strchrnul(fname, '.') - fname; -+ filename2modname(fname, modname); - while (m->symbols) { -- printf("alias symbol:%s %.*s\n", -+ printf("alias symbol:%s %s\n", - (char*)llist_pop(&m->symbols), -- fnlen, fname); -+ modname); - } - } - #endif ---- busybox-1.23.0/modutils/modprobe.c -+++ busybox-1.23.0-modprobe/modutils/modprobe.c -@@ -238,17 +238,6 @@ static void add_probe(const char *name) - { - struct module_entry *m; - -- /* -- * get_or_add_modentry() strips path from name and works -- * on remaining basename. -- * This would make "rmmod dir/name" and "modprobe dir/name" -- * to work like "rmmod name" and "modprobe name", -- * which is wrong, and can be abused via implicit modprobing: -- * "ifconfig /usbserial up" tries to modprobe netdev-/usbserial. -- */ -- if (strchr(name, '/')) -- bb_error_msg_and_die("malformed module name '%s'", name); -- - m = get_or_add_modentry(name); - if (!(option_mask32 & (OPT_REMOVE | OPT_SHOW_DEPS)) - && (m->flags & MODULE_FLAG_LOADED) ---- busybox-1.23.0/modutils/modprobe-small.c -+++ busybox-1.23.0-modprobe/modutils/modprobe-small.c -@@ -149,9 +149,13 @@ static void replace(char *s, char what, - static char *filename2modname(const char *filename, char *modname) - { - int i; -- char *from; -+ const char *from; - -- from = bb_get_last_path_component_nostrip(filename); -+ // Disabled since otherwise "modprobe dir/name" would work -+ // as if it is "modprobe name". It is unclear why -+ // 'basenamization' was here in the first place. -+ //from = bb_get_last_path_component_nostrip(filename); -+ from = filename; - for (i = 0; i < (MODULE_NAME_LEN-1) && from[i] != '\0' && from[i] != '.'; i++) - modname[i] = (from[i] == '-') ? '_' : from[i]; - modname[i] = '\0'; ---- busybox-1.23.0/modutils/modutils.c -+++ busybox-1.23.0-modprobe/modutils/modutils.c -@@ -48,13 +48,17 @@ int FAST_FUNC string_to_llist(char *stri - char* FAST_FUNC filename2modname(const char *filename, char *modname) - { - int i; -- char *from; -+ const char *from; - - if (filename == NULL) - return NULL; - if (modname == NULL) - modname = xmalloc(MODULE_NAME_LEN); -- from = bb_get_last_path_component_nostrip(filename); -+ // Disabled since otherwise "modprobe dir/name" would work -+ // as if it is "modprobe name". It is unclear why -+ // 'basenamization' was here in the first place. -+ //from = bb_get_last_path_component_nostrip(filename); -+ from = filename; - for (i = 0; i < (MODULE_NAME_LEN-1) && from[i] != '\0' && from[i] != '.'; i++) - modname[i] = (from[i] == '-') ? '_' : from[i]; - modname[i] = '\0'; diff --git a/package/busybox/patches/006-busybox-1.23.0-vi.patch b/package/busybox/patches/006-busybox-1.23.0-vi.patch deleted file mode 100644 index 3a07ab9d9..000000000 --- a/package/busybox/patches/006-busybox-1.23.0-vi.patch +++ /dev/null @@ -1,49 +0,0 @@ ---- busybox-1.23.0/editors/vi.c -+++ busybox-1.23.0-vi/editors/vi.c -@@ -542,9 +542,6 @@ static void cookmode(void); // return to - static int mysleep(int); - static int readit(void); // read (maybe cursor) key from stdin - static int get_one_char(void); // read 1 char from stdin --#if !ENABLE_FEATURE_VI_READONLY --#define file_insert(fn, p, update_ro_status) file_insert(fn, p) --#endif - // file_insert might reallocate text[]! - static int file_insert(const char *, char *, int); - static int file_write(char *, char *, char *); -@@ -1325,7 +1322,7 @@ static void colon(char *buf) - q = next_line(q); - { // dance around potentially-reallocated text[] - uintptr_t ofs = q - text; -- size = file_insert(fn, q, /*update_ro:*/ 0); -+ size = file_insert(fn, q, 0); - q = text + ofs; - } - if (size < 0) -@@ -2905,7 +2902,7 @@ static char *get_input_line(const char * - } - - // might reallocate text[]! --static int file_insert(const char *fn, char *p, int update_ro_status) -+static int file_insert(const char *fn, char *p, int initial) - { - int cnt = -1; - int fd, size; -@@ -2918,7 +2915,8 @@ static int file_insert(const char *fn, c - - fd = open(fn, O_RDONLY); - if (fd < 0) { -- status_line_bold_errno(fn); -+ if (!initial) -+ status_line_bold_errno(fn); - return cnt; - } - -@@ -2946,7 +2944,7 @@ static int file_insert(const char *fn, c - close(fd); - - #if ENABLE_FEATURE_VI_READONLY -- if (update_ro_status -+ if (initial - && ((access(fn, W_OK) < 0) || - /* root will always have access() - * so we check fileperms too */ diff --git a/package/jamvm/Makefile b/package/jamvm/Makefile index b25833364..f596ed019 100644 --- a/package/jamvm/Makefile +++ b/package/jamvm/Makefile @@ -4,20 +4,18 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= jamvm -PKG_VERSION:= 1.5.4 -PKG_RELEASE:= 5 -PKG_HASH:= 7865693698bc4322cabe1014a4b7ebdec1bc1daf45f1a4457b6e908a4446b124 +PKG_VERSION:= 2.0.0 +PKG_RELEASE:= 1 +PKG_HASH:= 76428e96df0ae9dd964c7a7c74c1e9a837e2f312c39e9a357fa8178f7eff80da PKG_DESCR:= java virtual machine implementation PKG_SECTION:= dev/lang -PKG_DEPENDS:= libffi zlib +PKG_DEPENDS:= libffi zlib libpthread librt PKG_BUILDDEP:= libffi zlib PKG_URL:= http://jamvm.sourceforge.net PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=jamvm/} DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz -PKG_ARCH_DEPENDS:= !m68k - include ${ADK_TOPDIR}/mk/host.mk include ${ADK_TOPDIR}/mk/package.mk @@ -27,30 +25,21 @@ $(eval $(call PKG_template,JAMVM,jamvm,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPEN HOST_CONFIGURE_ARGS+= --libdir=$(STAGING_HOST_DIR)/usr/lib/jamvm \ --includedir=$(STAGING_HOST_DIR)/usr/include/jamvm \ --with-classpath-install-dir=$(STAGING_HOST_DIR)/usr -BUILD_STYLE:= manual -INSTALL_STYLE:= manual CONFIGURE_ARGS+= --enable-ffi -hostpost-install: - ln -sf ${STAGING_HOST_DIR}/usr/bin/jamvm ${STAGING_HOST_DIR}/usr/lib/jvm/bin/java - ln -sf ${STAGING_HOST_DIR}/usr/bin/jamvm ${STAGING_HOST_DIR}/usr/lib/jvm/jre/bin/java - -do-build: - ${INSTALL_DIR} ${WRKINST}/usr/bin - ${INSTALL_DIR} ${WRKINST}/usr/share/jamvm - ${MAKE} -C ${WRKBUILD}/src \ - ${TARGET_CONFIGURE_OPTS} - ${CP} ${WRKBUILD}/src/jamvm ${WRKINST}/usr/bin - ${MAKE} -C ${WRKBUILD}/lib - ${CP} ${WRKBUILD}/lib/classes.zip ${WRKINST}/usr/share/jamvm - -do-install: +jamvm-install: ${INSTALL_DIR} ${IDIR_JAMVM}/usr/bin + ${INSTALL_DIR} ${IDIR_JAMVM}/usr/lib ${INSTALL_DIR} ${IDIR_JAMVM}/usr/share/jamvm - ${INSTALL_BIN} ${WRKINST}/usr/bin/jamvm ${IDIR_JAMVM}/usr/bin + ${INSTALL_BIN} ${WRKINST}/usr/bin/jamvm \ + ${IDIR_JAMVM}/usr/bin ${CP} ${WRKINST}/usr/share/jamvm/classes.zip \ ${IDIR_JAMVM}/usr/share/jamvm + $(CP) ${WRKINST}/usr/lib/libjvm.so \ + ${IDIR_JAMVM}/usr/lib + $(CP) ${WRKINST}/usr/lib/rt.jar \ + ${IDIR_JAMVM}/usr/lib include ${ADK_TOPDIR}/mk/host-bottom.mk include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/jamvm/patches/patch-ltmain_sh b/package/jamvm/patches/patch-ltmain_sh deleted file mode 100644 index e7a6c8f5d..000000000 --- a/package/jamvm/patches/patch-ltmain_sh +++ /dev/null @@ -1,11 +0,0 @@ ---- jamvm-1.5.4.orig/ltmain.sh 2009-01-03 07:08:36.000000000 +0100 -+++ jamvm-1.5.4/ltmain.sh 2011-01-15 22:06:10.000000000 +0100 -@@ -1676,7 +1676,7 @@ EOF - # -F/path gives path to uninstalled frameworks, gcc on darwin - # @file GCC response files - -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ -- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*) -+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-fstack-protector*|-flto) - - # Unknown arguments in both finalize_command and compile_command need - # to be aesthetically quoted because they are evaled later. diff --git a/package/jamvm/patches/patch-src_os_linux_os_c b/package/jamvm/patches/patch-src_os_linux_os_c deleted file mode 100644 index a867841e3..000000000 --- a/package/jamvm/patches/patch-src_os_linux_os_c +++ /dev/null @@ -1,17 +0,0 @@ ---- jamvm-1.5.4.orig/src/os/linux/os.c 2009-12-31 19:40:48.000000000 +0100 -+++ jamvm-1.5.4/src/os/linux/os.c 2013-12-25 16:43:03.000000000 +0100 -@@ -46,10 +46,12 @@ void *nativeStackBase() { - } - - int nativeAvailableProcessors() { --#ifdef __UCLIBC__ -+#if defined(__UCLIBC__) - return 1; --#else -+#elif defined(__GLIBC__) - return get_nprocs(); -+#else -+ return 1; - #endif - } - diff --git a/package/jikes/Makefile b/package/jikes/Makefile index 8e2b529ba..5a4bd097d 100644 --- a/package/jikes/Makefile +++ b/package/jikes/Makefile @@ -12,6 +12,8 @@ PKG_BUILDDEP:= jikes-host PKG_SECTION:= dev/lang PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=jikes/Jikes/1.22/} +PKG_CFLINE_JIKES:= depends on ADK_HOST_ONLY + DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.bz2 include $(ADK_TOPDIR)/mk/host.mk @@ -20,13 +22,5 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call HOST_template,JIKES,jikes,$(PKG_VERSION)-${PKG_RELEASE})) $(eval $(call PKG_template,JIKES,jikes,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -hostpost-install: - $(INSTALL_DIR) ${STAGING_HOST_DIR}/usr/lib/jvm/bin/ - $(INSTALL_DIR) ${STAGING_HOST_DIR}/usr/lib/jvm/jre/bin/ - $(CP) ${STAGING_HOST_DIR}/usr/bin/jikes ${STAGING_HOST_DIR}/usr/lib/jvm/bin/javac - $(CP) ${STAGING_HOST_DIR}/usr/bin/jikes ${STAGING_HOST_DIR}/usr/lib/jvm/jre/bin/javac - -jikes-install: - include ${ADK_TOPDIR}/mk/host-bottom.mk include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/libxslt/Makefile b/package/libxslt/Makefile index 658a0a572..eca6dd96d 100644 --- a/package/libxslt/Makefile +++ b/package/libxslt/Makefile @@ -7,10 +7,10 @@ PKG_NAME:= libxslt PKG_VERSION:= 1.1.28 PKG_RELEASE:= 2 PKG_HASH:= 5fc7151a57b89c03d7b825df5a0fae0a8d5f05674c0e7cf2937ecec4d54a028c -PKG_DESCR:= xslt Library +PKG_DESCR:= xslt library PKG_SECTION:= libs/data PKG_DEPENDS:= libxml2 libstdcxx -PKG_BUILDDEP:= libxml2 +PKG_BUILDDEP:= libxslt-host libxml2 HOST_BUILDDEP:= libxml2-host PKG_URL:= http://xmlsoft.org/XSLT PKG_SITES:= http://xmlsoft.org/sources/ diff --git a/package/lvm/Makefile b/package/lvm/Makefile index ec3bc8439..ab6b30faa 100644 --- a/package/lvm/Makefile +++ b/package/lvm/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= lvm -PKG_VERSION:= 2.02.116 +PKG_VERSION:= 2.02.120 PKG_RELEASE:= 1 -PKG_HASH:= 2479d6ea61c405efcfcd8a78390d00c1d2e9c92c0262f3ed599f2c0fb6f0b767 +PKG_HASH:= 8d6bd02f7d00315482538ece3e831cd81709c29d74ce71229c60192fb166081a PKG_DESCR:= logical volume management PKG_SECTION:= sys/fs PKG_DEPENDS:= libdevmapper libncurses @@ -38,6 +38,7 @@ endif CONFIGURE_ARGS+= --with-user="" --with-group="" \ --with-optimisation="" \ --disable-testing \ + --disable-blkid_wiping \ --with-lvm1=none CONFIGURE_ENV+= ac_cv_flag_HAVE_PIE=no \ ac_cv_func_malloc_0_nonnull=yes \ @@ -45,7 +46,8 @@ CONFIGURE_ENV+= ac_cv_flag_HAVE_PIE=no \ lvm-install: ${INSTALL_DIR} ${IDIR_LVM}/usr/sbin - ${INSTALL_BIN} ${WRKINST}/usr/sbin/lvm ${IDIR_LVM}/usr/sbin/lvm + ${INSTALL_BIN} ${WRKINST}/usr/sbin/lvm \ + ${IDIR_LVM}/usr/sbin libdevmapper-install: ${INSTALL_DIR} ${IDIR_LIBDEVMAPPER}/usr/lib diff --git a/package/lvm/patches/patch-make_tmpl_in b/package/lvm/patches/patch-make_tmpl_in deleted file mode 100644 index e25835467..000000000 --- a/package/lvm/patches/patch-make_tmpl_in +++ /dev/null @@ -1,11 +0,0 @@ ---- LVM2.2.02.106.orig/make.tmpl.in 2014-04-10 17:38:46.000000000 +0200 -+++ LVM2.2.02.106/make.tmpl.in 2014-05-23 08:48:28.000000000 +0200 -@@ -46,7 +46,7 @@ LIBS = @LIBS@ - STATIC_LIBS = $(SELINUX_LIBS) $(UDEV_LIBS) $(BLKID_LIBS) - DEFS += @DEFS@ - # FIXME set this only where it's needed, not globally? --CFLAGS += @CFLAGS@ -+CFLAGS ?= @CFLAGS@ - CLDFLAGS += @CLDFLAGS@ - ELDFLAGS += @ELDFLAGS@ - LDDEPS += @LDDEPS@ diff --git a/package/openjdk7/Makefile b/package/openjdk7/Makefile index 68c933c01..ca7c4ed64 100644 --- a/package/openjdk7/Makefile +++ b/package/openjdk7/Makefile @@ -12,10 +12,9 @@ PKG_SECTION:= dev/lang PKG_BUILDDEP:= openjdk7-host alsa-lib xproto libjpeg-turbo zlib giflib libpng freetype cups PKG_BUILDDEP+= libX11 libXt libXp libXinerama libXrender libXtst PKG_BUILDDEP+= libpng giflib libgtk2 glib fontconfig nss -HOST_BUILDDEP:= fastjar-host gcj-host ecj-host classpath-host jamvm-host -HOST_BUILDDEP+= jikes-host ant-host libXtst-host libXt-host libXinerama-host -HOST_BUILDDEP+= cups-host qemu-host alsa-lib-host freetype-host unzip-host -HOST_BUILDDEP+= libxslt-host +HOST_BUILDDEP:= fastjar-host gcj-host ecj-host unzip-host +HOST_BUILDDEP+= ant-host libXtst-host libXt-host libXinerama-host +HOST_BUILDDEP+= cups-host qemu-host alsa-lib-host freetype-host libxslt-host PKG_DEPENDS:= zlib libstdcxx libffi libpthread libxtst libxi cups PKG_DEPENDS+= libfreetype libxrender libx11 libxext libpthread nss libjpeg-turbo PKG_DEPENDS+= libpng giflib libgtk2 glib fontconfig @@ -27,7 +26,7 @@ PKG_BUILDDEP_UCLIBC_NG:=libiconv-tiny DISTFILES:= icedtea-$(PKG_VERSION).tar.xz WRKDIST= ${WRKDIR}/icedtea-${PKG_VERSION} -GCJ_VER:= 4.8.4 +GCJ_VER:= 4.9.2 PKG_HOST_DEPENDS:= linux PKG_ARCH_DEPENDS:= arm mips ppc x86 x86_64 diff --git a/package/u-boot-git/Makefile b/package/u-boot-git/Makefile index d5f22ba97..4a7452476 100644 --- a/package/u-boot-git/Makefile +++ b/package/u-boot-git/Makefile @@ -4,7 +4,7 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= u-boot-git -PKG_VERSION:= d8c1d5d5fb6eafbc532982125f006e49f2c40e71 +PKG_VERSION:= 3bfe3ce2a6e3b04da1d04dbc0520dcc26e17f98a PKG_RELEASE:= 1 PKG_DESCR:= portable bootloader PKG_SECTION:= base/boot diff --git a/target/arm/uclibc.config b/target/arm/uclibc.config index 7f07db725..680308c99 100644 --- a/target/arm/uclibc.config +++ b/target/arm/uclibc.config @@ -153,6 +153,7 @@ UCLIBC_HAS_NETWORK_SUPPORT=y UCLIBC_HAS_SOCKET=y UCLIBC_HAS_IPV4=y UCLIBC_HAS_IPV6=y +# UCLIBC_HAS_RPC is not set UCLIBC_USE_NETLINK=y UCLIBC_SUPPORT_AI_ADDRCONFIG=y UCLIBC_HAS_BSD_RES_CLOSE=y diff --git a/target/config/Config.in.kernelversion.choice b/target/config/Config.in.kernelversion.choice index 323d89387..0819c1430 100644 --- a/target/config/Config.in.kernelversion.choice +++ b/target/config/Config.in.kernelversion.choice @@ -4,15 +4,13 @@ choice prompt "Kernel Version" depends on ADK_TARGET_KERNEL_CUSTOMISING -default ADK_KERNEL_VERSION_3_19_5 if ADK_TARGET_SYSTEM_QEMU_SPARC -default ADK_KERNEL_VERSION_3_18_12 +default ADK_KERNEL_VERSION_4_0_3 config ADK_KERNEL_VERSION_4_0_3 bool "4.0.3" select ADK_KERNEL_VERSION_4_0 depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI2 - depends on !ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 config ADK_KERNEL_VERSION_3_19_5 bool "3.19.5" diff --git a/target/linux/config/Config.in.ethernet b/target/linux/config/Config.in.ethernet index 14daf5184..e74c30123 100644 --- a/target/linux/config/Config.in.ethernet +++ b/target/linux/config/Config.in.ethernet @@ -89,6 +89,7 @@ config ADK_KERNEL_USB_NET_SMSC95XX config ADK_KERNEL_SMC91X tristate "SMC91X ethernet driver" select ADK_KERNEL_NET_VENDOR_SMSC + select ADK_KERNEL_GPIOLIB depends on ADK_TARGET_SYSTEM_ARM_FM || ADK_TARGET_QEMU_ARM_MODEL_VERSATILEPB default y if ADK_TARGET_QEMU_ARM_MODEL_VERSATILEPB default y if ADK_TARGET_SYSTEM_ARM_FM diff --git a/target/linux/patches/4.0.3/initramfs-nosizelimit.patch b/target/linux/patches/4.0.3/initramfs-nosizelimit.patch new file mode 100644 index 000000000..40d2f6bd8 --- /dev/null +++ b/target/linux/patches/4.0.3/initramfs-nosizelimit.patch @@ -0,0 +1,57 @@ +From 9a18df7a71bfa620b1278777d64783a359d7eb4e Mon Sep 17 00:00:00 2001 +From: Thorsten Glaser <tg@mirbsd.org> +Date: Sun, 4 May 2014 01:37:54 +0200 +Subject: [PATCH] mount tmpfs-as-rootfs (initramfs) with -o + nr_blocks=0,nr_inodes=0 + +I would have preferred to write this patch to be able to pass +rootflags=nr_blocks=0,nr_inodes=0 on the kernel command line, +and then hand these rootflags over to the initramfs (tmpfs) +mount in the same way the kernel hands them over to the block +device rootfs mount. But at least the Debian/m68k initrd also +parses $rootflags from the environment and adds it to the call +to the user-space mount for the eventual root device, which +would make the kernel command line rootflags option be used in +both places (tmpfs and e.g. ext4) which is guaranteed to error +out in at least one of them. + +This change is intended to aid people in a setup where the +initrd is the final root filesystem, i.e. not mounted over. +This is especially useful in automated tests running on qemu +for boards with constrained memory (e.g. 64 MiB on sh4). + +Considering that the initramfs is normally emptied out then +overmounted, this change is probably safe for setups where +initramfs just hosts early userspace, too, since the tmpfs +backing it is not accessible any more later on, AFAICT. + +Signed-off-by: Thorsten Glaser <tg@mirbsd.org> +--- + init/do_mounts.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/init/do_mounts.c b/init/do_mounts.c +index 82f2288..55a4cfe 100644 +--- a/init/do_mounts.c ++++ b/init/do_mounts.c +@@ -594,6 +594,7 @@ out: + } + + static bool is_tmpfs; ++static char tmpfs_rootflags[] = "nr_blocks=0,nr_inodes=0"; + static struct dentry *rootfs_mount(struct file_system_type *fs_type, + int flags, const char *dev_name, void *data) + { +@@ -606,6 +607,9 @@ static struct dentry *rootfs_mount(struct file_system_type *fs_type, + if (IS_ENABLED(CONFIG_TMPFS) && is_tmpfs) + fill = shmem_fill_super; + ++ if (is_tmpfs) ++ data = tmpfs_rootflags; ++ + return mount_nodev(fs_type, flags, data, fill); + } + +-- +2.0.0.rc0 + diff --git a/target/linux/patches/4.0.3/startup.patch b/target/linux/patches/4.0.3/startup.patch new file mode 100644 index 000000000..d396b75e4 --- /dev/null +++ b/target/linux/patches/4.0.3/startup.patch @@ -0,0 +1,37 @@ +diff -Nur linux-3.13.3.orig/init/main.c linux-3.13.3/init/main.c +--- linux-3.13.3.orig/init/main.c 2014-02-13 23:00:14.000000000 +0100 ++++ linux-3.13.3/init/main.c 2014-02-17 11:35:14.000000000 +0100 +@@ -916,6 +917,8 @@ + if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0) + pr_err("Warning: unable to open an initial console.\n"); + ++ printk(KERN_WARNING "Starting Linux (built with OpenADK).\n"); ++ + (void) sys_dup(0); + (void) sys_dup(0); + /* +diff -Nur linux-3.13.6.orig/init/initramfs.c linux-3.13.6/init/initramfs.c +--- linux-3.13.6.orig/init/initramfs.c 2014-03-07 07:07:02.000000000 +0100 ++++ linux-3.13.6/init/initramfs.c 2014-03-15 12:11:31.882731916 +0100 +@@ -622,6 +622,9 @@ + */ + load_default_modules(); + } ++#ifdef CONFIG_DEVTMPFS_MOUNT ++ devtmpfs_mount("dev"); ++#endif + return 0; + } + rootfs_initcall(populate_rootfs); +diff -Nur linux-3.13.6.orig/init/main.c linux-3.13.6/init/main.c +--- linux-3.13.6.orig/init/main.c 2014-03-07 07:07:02.000000000 +0100 ++++ linux-3.13.6/init/main.c 2014-03-15 12:13:16.459024452 +0100 +@@ -924,7 +924,7 @@ + */ + + if (!ramdisk_execute_command) +- ramdisk_execute_command = "/init"; ++ ramdisk_execute_command = "/sbin/init"; + + if (sys_access((const char __user *) ramdisk_execute_command, 0) != 0) { + ramdisk_execute_command = NULL; |