package/apex: update apex to version 1.6.9
SVN-Revision: 22900
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user