package/apex: update apex to version 1.6.9

SVN-Revision: 22900

4 files changed, 20 insertions, 20 deletions

diff --git a/package/apex/Makefile b/package/apex/Makefile
index e582c56..97ddee1 100644
--- a/package/apex/Makefile
+++ b/package/apex/Makefile
@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=apex
-PKG_VERSION:=1.5.14
-PKG_RELEASE:=3
+PKG_VERSION:=1.6.9
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=ftp://ftp.buici.com/pub/apex/ \
 	ftp://metalab.unc.edu/pub/Linux/system/boot/apex/
-PKG_MD5SUM:=22fb46e76c8221c7bcc9734602367460
+PKG_MD5SUM:=9606cf2e3fd2c9a86fe0b61388509a30
 PKG_TARGETS:=bin
 
 include $(INCLUDE_DIR)/package.mk
diff --git a/package/apex/patches/100-openwrt_nslu2_armeb_config.patch b/package/apex/patches/100-openwrt_nslu2_armeb_config.patch
index 49933ea..7e9cfdf 100644
--- a/package/apex/patches/100-openwrt_nslu2_armeb_config.patch
+++ b/package/apex/patches/100-openwrt_nslu2_armeb_config.patch
@@ -1,6 +1,6 @@
 --- a/src/mach-ixp42x/slugos-nslu2-armeb_config
 +++ b/src/mach-ixp42x/slugos-nslu2-armeb_config
-@@ -17,7 +17,7 @@ CONFIG_EXPERIMENTAL=y
+@@ -19,7 +19,7 @@ CONFIG_EXPERIMENTAL=y
  #
  # General Setup
  #
@@ -8,15 +8,15 @@
 +CONFIG_TARGET_DESCRIPTION="OpenWRT NSLU2 (8MiB Flash)"
  CONFIG_CROSS_COMPILE=""
  CONFIG_AEABI=y
- CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-@@ -150,9 +150,9 @@ CONFIG_ENV_REGION_KERNEL_ALT="fis://kern
- #    Overrides
+ # CONFIG_DRIVER_LONG_LONG_SIZE is not set
+@@ -163,9 +163,9 @@ CONFIG_ENV_REGION_KERNEL_ALT="fis://kern
+ # Overrides
  #
  CONFIG_ENV_DEFAULT_CMDLINE_OVERRIDE=y
--CONFIG_ENV_DEFAULT_CMDLINE="root=/dev/mtdblock4 rootfstype=jffs2 console=ttyS0,115200"
+-CONFIG_ENV_DEFAULT_CMDLINE="root=/dev/mtdblock4 rootfstype=jffs2 console=ttyS0,115200 init=/linuxrc"
 +CONFIG_ENV_DEFAULT_CMDLINE="root=/dev/mtdblock4 rootfstype=squashfs,jffs2 console=ttyS0,115200 init=/etc/preinit noinitrd"
  CONFIG_ENV_DEFAULT_CMDLINE_ALT_P=y
--CONFIG_ENV_DEFAULT_CMDLINE_ALT="root=/dev/mtdblock4 rootfstype=jffs2 console=ttyS0,115200"
+-CONFIG_ENV_DEFAULT_CMDLINE_ALT="root=/dev/mtdblock4 rootfstype=jffs2 console=ttyS0,115200 init=/linuxrc"
 +CONFIG_ENV_DEFAULT_CMDLINE_ALT="root=/dev/mtdblock4 rootfstype=squashfs,jffs2 console=ttyS0,115200 init=/etc/preinit noinitrd"
  # CONFIG_ENV_DEFAULT_STARTUP_OVERRIDE is not set
  # CONFIG_ENV_DEFAULT_STARTUP_ALT_P is not set
diff --git a/package/apex/patches/120-openwrt_nslu2_16mb_armeb_config.patch b/package/apex/patches/120-openwrt_nslu2_16mb_armeb_config.patch
index 4792091..614ef7f 100644
--- a/package/apex/patches/120-openwrt_nslu2_16mb_armeb_config.patch
+++ b/package/apex/patches/120-openwrt_nslu2_16mb_armeb_config.patch
@@ -1,6 +1,6 @@
 --- a/src/mach-ixp42x/slugos-nslu2-16mb-armeb_config
 +++ b/src/mach-ixp42x/slugos-nslu2-16mb-armeb_config
-@@ -17,7 +17,7 @@ CONFIG_EXPERIMENTAL=y
+@@ -19,7 +19,7 @@ CONFIG_EXPERIMENTAL=y
  #
  # General Setup
  #
@@ -8,15 +8,15 @@
 +CONFIG_TARGET_DESCRIPTION="OpenWRT NSLU2 (16MiB Flash)"
  CONFIG_CROSS_COMPILE=""
  CONFIG_AEABI=y
- CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-@@ -150,9 +150,9 @@ CONFIG_ENV_REGION_KERNEL_ALT="fis://kern
- #    Overrides
+ # CONFIG_DRIVER_LONG_LONG_SIZE is not set
+@@ -163,9 +163,9 @@ CONFIG_ENV_REGION_KERNEL_ALT="fis://kern
+ # Overrides
  #
  CONFIG_ENV_DEFAULT_CMDLINE_OVERRIDE=y
--CONFIG_ENV_DEFAULT_CMDLINE="root=/dev/mtdblock4 rootfstype=jffs2 console=ttyS0,115200"
+-CONFIG_ENV_DEFAULT_CMDLINE="root=/dev/mtdblock4 rootfstype=jffs2 console=ttyS0,115200 init=/linuxrc"
 +CONFIG_ENV_DEFAULT_CMDLINE="root=/dev/mtdblock4 rootfstype=squashfs,jffs2 console=ttyS0,115200 init=/etc/preinit noinitrd"
  CONFIG_ENV_DEFAULT_CMDLINE_ALT_P=y
--CONFIG_ENV_DEFAULT_CMDLINE_ALT="root=/dev/mtdblock4 rootfstype=jffs2 console=ttyS0,115200"
+-CONFIG_ENV_DEFAULT_CMDLINE_ALT="root=/dev/mtdblock4 rootfstype=jffs2 console=ttyS0,115200 init=/linuxrc"
 +CONFIG_ENV_DEFAULT_CMDLINE_ALT="root=/dev/mtdblock4 rootfstype=squashfs,jffs2 console=ttyS0,115200 init=/etc/preinit noinitrd"
  # CONFIG_ENV_DEFAULT_STARTUP_OVERRIDE is not set
  # CONFIG_ENV_DEFAULT_STARTUP_ALT_P is not set
diff --git a/package/apex/patches/160-openwrt_nas100d_armeb_config.patch b/package/apex/patches/160-openwrt_nas100d_armeb_config.patch
index 83d8c3f..0b0c985 100644
--- a/package/apex/patches/160-openwrt_nas100d_armeb_config.patch
+++ b/package/apex/patches/160-openwrt_nas100d_armeb_config.patch
@@ -1,6 +1,6 @@
 --- a/src/mach-ixp42x/slugos-nas100d-armeb_config
 +++ b/src/mach-ixp42x/slugos-nas100d-armeb_config
-@@ -17,7 +17,7 @@ CONFIG_EXPERIMENTAL=y
+@@ -19,7 +19,7 @@ CONFIG_EXPERIMENTAL=y
  #
  # General Setup
  #
@@ -8,12 +8,12 @@
 +CONFIG_TARGET_DESCRIPTION="OpenWRT NAS100D"
  CONFIG_CROSS_COMPILE=""
  CONFIG_AEABI=y
- CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-@@ -145,7 +145,7 @@ CONFIG_ENV_REGION_KERNEL="fis://kernel"
- #    Overrides
+ # CONFIG_DRIVER_LONG_LONG_SIZE is not set
+@@ -158,7 +158,7 @@ CONFIG_ENV_REGION_KERNEL="fis://kernel"
+ # Overrides
  #
  CONFIG_ENV_DEFAULT_CMDLINE_OVERRIDE=y
--CONFIG_ENV_DEFAULT_CMDLINE="root=/dev/mtdblock2 rootfstype=jffs2 console=ttyS0,115200"
+-CONFIG_ENV_DEFAULT_CMDLINE="root=/dev/mtdblock2 rootfstype=jffs2 console=ttyS0,115200 init=/linuxrc"
 +CONFIG_ENV_DEFAULT_CMDLINE="root=/dev/mtdblock2 rootfstype=squashfs,jffs2 console=ttyS0,115200 init=/etc/preinit noinitrd"
  # CONFIG_ENV_DEFAULT_STARTUP_OVERRIDE is not set
  CONFIG_USES_NOR_BOOTFLASH=y