diff options
77 files changed, 390 insertions, 4659 deletions
diff --git a/package/base-files/Makefile b/package/base-files/Makefile index 827007550..9fd7903a6 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -6,7 +6,7 @@ include $(ADK_TOPDIR)/mk/rootfs.mk PKG_NAME:= base-files PKG_VERSION:= 1.1 -PKG_RELEASE:= 10 +PKG_RELEASE:= 11 PKG_SECTION:= base/apps PKG_DESCR:= basic files and scripts @@ -96,8 +96,7 @@ endif echo "ff02::2 ip6-allrouters" >> $(IDIR_BASE_FILES)/etc/hosts echo "ff02::3 ip6-allhosts" >> $(IDIR_BASE_FILES)/etc/hosts test -z '$(ADK_RUNTIME_PASSWORD)' || \ - $(SED) 's,\*NP\*,'"$$($(STAGING_HOST_DIR)/usr/bin/mkcrypt \ - $$(awk -F\= '/^ADK_RUNTIME_PASSWORD/ { print $$2 }' $(ADK_TOPDIR)/.config|sed -e 's^\"^^g')),g" \ + $(SED) 's,\*NP\*,'"$$(awk -F\= '/^ADK_RUNTIME_PASSWORD/ { print $$2 }' $(ADK_TOPDIR)/.config|sed -e 's^\"^^g')),g" \ $(IDIR_BASE_FILES)/etc/shadow echo $(ADK_RUNTIME_TMPFS_SIZE) > $(IDIR_BASE_FILES)/etc/tmpfs ifeq ($(ADK_TARGET_WITH_ROOT_RW),y) diff --git a/package/busybox/config/console-tools/Config.in b/package/busybox/config/console-tools/Config.in index 5a1dc29c4..ae1c7cbad 100644 --- a/package/busybox/config/console-tools/Config.in +++ b/package/busybox/config/console-tools/Config.in @@ -46,7 +46,6 @@ config BUSYBOX_DUMPKMAP config BUSYBOX_KBD_MODE bool "kbd_mode" default n - default y if ADK_TARGET_WITH_INPUT select BUSYBOX_PLATFORM_LINUX help This program reports and sets keyboard mode. @@ -60,7 +59,6 @@ config BUSYBOX_LOADFONT config BUSYBOX_LOADKMAP bool "loadkmap" - default y if ADK_TARGET_WITH_INPUT default n select BUSYBOX_PLATFORM_LINUX help @@ -84,7 +82,7 @@ config BUSYBOX_RESET config BUSYBOX_RESIZE bool "resize" - default y + default n help This program is used to (re)set the width and height of your current terminal. @@ -138,7 +136,7 @@ config BUSYBOX_DEFAULT_SETFONT_DIR config BUSYBOX_SETKEYCODES bool "setkeycodes" - default y + default n select BUSYBOX_PLATFORM_LINUX help This program loads entries into the kernel's scancode-to-keycode @@ -146,14 +144,14 @@ config BUSYBOX_SETKEYCODES config BUSYBOX_SETLOGCONS bool "setlogcons" - default y + default n select BUSYBOX_PLATFORM_LINUX help This program redirects the output console of kernel messages. config BUSYBOX_SHOWKEY bool "showkey" - default y + default n select BUSYBOX_PLATFORM_LINUX help Shows keys pressed. diff --git a/package/firefox/Makefile b/package/firefox/Makefile index e7b81944d..1a9aabb77 100644 --- a/package/firefox/Makefile +++ b/package/firefox/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= firefox -PKG_VERSION:= 26.0 -PKG_RELEASE:= 4 -PKG_HASH:= 31c4fb2792df63ae450e350380a5e18cf1c51487011a9da0b6cc4bffb69d9812 +PKG_VERSION:= 35.0 +PKG_RELEASE:= 1 +PKG_HASH:= bedeb5bbd8b49e5b286497ef7732542c6e7441088fd8cd577d7ca8af4c871e81 PKG_DESCR:= graphical webbrowser PKG_SECTION:= x11/apps PKG_DEPENDS:= libpthread alsa-lib glib libgtk libpng libtiff libxcursor libffi @@ -18,20 +18,21 @@ PKG_BUILDDEP+= nspr nss libjpeg-turbo libXt fontconfig sqlite atk libpng hicolo PKG_BUILDDEP+= libvpx pango gettext-tiny bzip2 libevent bzip2-host python2-host yasm-host PKG_BUILDDEP+= zip-host PKG_URL:= http://www.mozilla.org/ -PKG_SITES:= http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${PKG_VERSION}/source/ +PKG_SITES:= http://releases.mozilla.org/pub/mozilla.org/firefox/releases/$(PKG_VERSION)/source/ PKG_NOPARALLEL:= 1 PKG_ARCH_DEPENDS:= arm x86 x86_64 mips PKG_HOST_DEPENDS:= !netbsd !freebsd !openbsd !cygwin -PKG_SYSTEM_DEPENDS:= tarox-pc ibm-x40 lemote-yeelong qemu-i686 qemu-x86_64 qemu-mips64el raspberry-pi +PKG_SYSTEM_DEPENDS:= solidrun-imx6 ibm-x40 lemote-yeelong qemu-i686 qemu-x86_64 qemu-mips64el raspberry-pi -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.source.tar.bz2 -WRKDIST= ${WRKDIR}/mozilla-release +DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).source.tar.bz2 +WRKDIST= $(WRKDIR)/mozilla-release +WRKBUILD= $(WRKDIR)/$(PKG_NAME)-obj include $(ADK_TOPDIR)/mk/package.mk include $(ADK_TOPDIR)/mk/python.mk -$(eval $(call PKG_template,FIREFOX,firefox,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,FIREFOX,firefox,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION))) ifeq ($(ADK_DEBUG),y) CONFIGURE_ARGS+= --enable-debug --enable-logging @@ -42,14 +43,14 @@ endif CONFIGURE_ENV+= CROSS_COMPILE=1 \ PYTHON="$(PYTHON)" \ - HOST_CC="${HOST_CC}" \ - HOST_CPPFLAGS="${HOST_CPPFLAGS}" \ - HOST_CFLAGS="${HOST_CFLAGS}" \ - HOST_LDFLAGS="${HOST_LDLAGS}" \ - HOST_CXX="${HOST_CXX}" \ - HOST_CXXFLAGS="${HOST_CXXFLAGS}" \ + HOST_CC="$(HOST_CC)" \ + HOST_CPPFLAGS="$(HOST_CPPFLAGS)" \ + HOST_CFLAGS="$(HOST_CFLAGS)" \ + HOST_LDFLAGS="$(HOST_LDLAGS)" \ + HOST_CXX="$(HOST_CXX)" \ + HOST_CXXFLAGS="$(HOST_CXXFLAGS)" \ HOST_RANLIB="ranlib" HOST_AR="ar" \ - CPPFLAGS="-I${STAGING_TARGET_DIR}/usr/include/freetype2" \ + CPPFLAGS="-I$(STAGING_TARGET_DIR)/usr/include/freetype2" \ ac_cv_sqlite_secure_delete=yes \ ac_cv_sqlite_threadsafe=yes \ ac_cv_sqlite_enable_fts3=yes \ @@ -66,19 +67,24 @@ CONFIGURE_ARGS+= --enable-application=browser \ --with-system-nspr \ --with-system-pango \ --with-system-libvpx \ - --with-system-libevent=${STAGING_TARGET_DIR}/usr \ + --with-system-libevent=$(STAGING_TARGET_DIR)/usr \ --enable-system-ffi \ --enable-system-sqlite \ --disable-libnotify \ - --with-libIDL-prefix=${STAGING_TARGET_DIR}/usr \ - --with-glib-prefix=${STAGING_TARGET_DIR}/usr \ + --with-libIDL-prefix=$(STAGING_TARGET_DIR)/usr \ + --with-glib-prefix=$(STAGING_TARGET_DIR)/usr \ --enable-chrome-format=jar \ --enable-necko-protocols=all \ --enable-libxul \ --enable-alsa \ + --disable-profiling \ + --disable-jprof \ + --disable-shark \ + --disable-systrace \ --disable-pulseaudio \ --disable-gstreamer \ --disable-gio \ + --disable-gold \ --disable-gconf \ --disable-accessibility \ --disable-smil \ @@ -98,6 +104,8 @@ CONFIGURE_ARGS+= --enable-application=browser \ --disable-mathml \ --disable-jemalloc \ --disable-crashreporter \ + --disable-printing \ + --disable-pie \ --disable-updater \ --disable-xpcom-fastload \ --disable-url-classifier \ @@ -109,17 +117,17 @@ TARGET_CFLAGS:= $(subst Os,g3,$(TARGET_CFLAGS)) endif XAKE_FLAGS+= OS_RELEASE="2.6" HOST_CC=$(HOST_CC) HOST_LDFLAGS=$(HOST_LDFLAGS) -XAKE_FLAGS+= ARCHFLAG="${TARGET_CFLAGS} ${TARGET_CPPFLAGS} ${TARGET_LDFLAGS} -lnss3 -lnssutil3 -lsmime3 -lssl3 -fPIC" +XAKE_FLAGS+= ARCHFLAG="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS) $(TARGET_LDFLAGS) -lnss3 -lnssutil3 -lsmime3 -lssl3 -fPIC" pre-build: - -mkdir ${WRKBUILD}/js/src/.deps + -mkdir $(WRKBUILD)/js/src/.deps firefox-install: $(INSTALL_DIR) $(IDIR_FIREFOX)/usr/bin $(INSTALL_DIR) $(IDIR_FIREFOX)/usr/lib - $(CP) $(WRKINST)/usr/lib/firefox-${PKG_VERSION} \ + $(CP) $(WRKINST)/usr/lib/firefox-$(PKG_VERSION) \ $(IDIR_FIREFOX)/usr/lib $(CP) ./files/firefox \ $(IDIR_FIREFOX)/usr/bin -include ${ADK_TOPDIR}/mk/pkg-bottom.mk +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/firefox/files/firefox b/package/firefox/files/firefox index 339daaf09..30470334a 100755 --- a/package/firefox/files/firefox +++ b/package/firefox/files/firefox @@ -1,2 +1,2 @@ #!/bin/sh -env LD_LIBRARY_PATH=/usr/lib/firefox-26.0 /usr/lib/firefox-26.0/firefox +env LD_LIBRARY_PATH=/usr/lib/firefox-35.0 /usr/lib/firefox-35.0/firefox diff --git a/package/firefox/patches/patch-configure b/package/firefox/patches/patch-configure index 884cea4dd..52210624e 100644 --- a/package/firefox/patches/patch-configure +++ b/package/firefox/patches/patch-configure @@ -1,30 +1,41 @@ ---- mozilla-release.orig/configure 2013-12-05 17:08:46.000000000 +0100 -+++ mozilla-release/configure 2014-01-06 18:17:43.008094174 +0100 -@@ -9787,27 +9787,6 @@ if test -z "$GNU_CC"; then - esac +--- mozilla-release.orig/configure 2015-01-09 05:39:04.000000000 +0100 ++++ mozilla-release/configure 2015-02-04 11:49:00.000000000 +0100 +@@ -8156,38 +8156,6 @@ EOF + fi --if test "$GNU_CC" -a -n "$DEVELOPER_OPTIONS"; then -- if $CC -Wl,--version 2>&1 | grep -q "GNU ld"; then -- GOLD=$($CC -print-prog-name=ld.gold) -- case "$GOLD" in -- /*) -- ;; -- *) -- GOLD=$(which $GOLD) -- ;; -- esac -- if test -n "$GOLD"; then -- mkdir -p $_objdir/build/unix/gold -- ln -s "$GOLD" $_objdir/build/unix/gold/ld -- if $CC -B $_objdir/build/unix/gold -Wl,--version 2>&1 | grep -q "GNU gold"; then -- LDFLAGS="$LDFLAGS -B $_objdir/build/unix/gold" -- else -- rm -rf $_objdir/build/unix/gold -- fi -- fi -- fi +-MOZ_ENABLE_PROFILER_SPS=1 +- +-case "${OS_TARGET}" in +-Android) +- case "${CPU_ARCH}" in +- x86 | arm) ;; +- *) +- MOZ_ENABLE_PROFILER_SPS= +- esac +- ;; +-Linux) +- case "${CPU_ARCH}" in +- x86 | x86_64) ;; +- *) +- MOZ_ENABLE_PROFILER_SPS= +- esac +- ;; +-WINNT|Darwin) ;; +-*) +- MOZ_ENABLE_PROFILER_SPS= +- ;; +-esac +- +-if test -n "$MOZ_ENABLE_PROFILER_SPS"; then +- cat >> confdefs.pytmp <<\EOF +- (''' MOZ_ENABLE_PROFILER_SPS ''', ' 1 ') +-EOF +-cat >> confdefs.h <<\EOF +-#define MOZ_ENABLE_PROFILER_SPS 1 +-EOF +- -fi - if test "$GNU_CC"; then - if test -z "$DEVELOPER_OPTIONS"; then + # Check whether --enable-shark or --disable-shark was given. + if test "${enable_shark+set}" = set; then diff --git a/package/firefox/patches/patch-gfx_angle_src_common_angleutils_cpp b/package/firefox/patches/patch-gfx_angle_src_common_angleutils_cpp new file mode 100644 index 000000000..bcf9ac30a --- /dev/null +++ b/package/firefox/patches/patch-gfx_angle_src_common_angleutils_cpp @@ -0,0 +1,10 @@ +--- mozilla-release.orig/gfx/angle/src/common/angleutils.cpp 2015-01-09 05:38:28.000000000 +0100 ++++ mozilla-release/gfx/angle/src/common/angleutils.cpp 2015-02-03 04:42:10.000000000 +0100 +@@ -7,6 +7,7 @@ + #include "common/angleutils.h" + + #include <vector> ++#include <cstdio> + + std::string FormatString(const char *fmt, va_list vararg) + { diff --git a/package/firefox/patches/patch-gfx_layers_BufferUnrotate_cpp b/package/firefox/patches/patch-gfx_layers_BufferUnrotate_cpp deleted file mode 100644 index 0a96d2259..000000000 --- a/package/firefox/patches/patch-gfx_layers_BufferUnrotate_cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- mozilla-release.orig/gfx/layers/BufferUnrotate.cpp 2013-12-05 17:07:31.000000000 +0100 -+++ mozilla-release/gfx/layers/BufferUnrotate.cpp 2014-01-06 21:27:39.000000000 +0100 -@@ -8,6 +8,7 @@ - #include <stdint.h> - #include <stdio.h> - #include <stdlib.h> -+#include <string.h> - - void BufferUnrotate(uint8_t* aBuffer, int aByteWidth, int aHeight, - int aByteStride, int aXBoundary, int aYBoundary) diff --git a/package/firefox/patches/patch-ipc_chromium_src_base_debug_util_posix_cc b/package/firefox/patches/patch-ipc_chromium_src_base_debug_util_posix_cc deleted file mode 100644 index 8537bed9a..000000000 --- a/package/firefox/patches/patch-ipc_chromium_src_base_debug_util_posix_cc +++ /dev/null @@ -1,13 +0,0 @@ ---- mozilla-release.orig/ipc/chromium/src/base/debug_util_posix.cc 2013-09-11 01:15:04.000000000 +0200 -+++ mozilla-release/ipc/chromium/src/base/debug_util_posix.cc 2013-10-23 16:28:38.000000000 +0200 -@@ -5,7 +5,9 @@ - #include "build/build_config.h" - #include "base/debug_util.h" - --#define MOZ_HAVE_EXECINFO_H (defined(OS_LINUX) && !defined(ANDROID)) -+#include <features.h> -+ -+#define MOZ_HAVE_EXECINFO_H (defined(OS_LINUX) && !defined(ANDROID) && !defined(__UCLIBC__)) && defined(__GLIBC__) - - #include <errno.h> - #include <fcntl.h> diff --git a/package/firefox/patches/patch-ipc_chromium_src_base_file_util_h b/package/firefox/patches/patch-ipc_chromium_src_base_file_util_h deleted file mode 100644 index 5f7e30a10..000000000 --- a/package/firefox/patches/patch-ipc_chromium_src_base_file_util_h +++ /dev/null @@ -1,10 +0,0 @@ ---- mozilla-release.orig/ipc/chromium/src/base/file_util.h 2013-12-05 17:07:35.000000000 +0100 -+++ mozilla-release/ipc/chromium/src/base/file_util.h 2014-0 |