aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2012-04-15 15:21:55 +0000
committerJo-Philipp Wich <jow@openwrt.org>2012-04-15 15:21:55 +0000
commit28595660945d12c2062ccf097eb87bf8fa9b1889 (patch)
tree30dcb4c3df65a05bbff061b0705986d10fa7b354
parent9ce5247c0b701bc731a3204c8c74290442051c00 (diff)
downloadupstream-28595660945d12c2062ccf097eb87bf8fa9b1889.tar.gz
upstream-28595660945d12c2062ccf097eb87bf8fa9b1889.tar.bz2
upstream-28595660945d12c2062ccf097eb87bf8fa9b1889.zip
[package] base-files: reformat banner to better work with varying version string lengths, do not set image options if menu is disabled (#11280)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31289 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/base-files/Makefile2
-rw-r--r--package/base-files/files/etc/banner4
-rw-r--r--package/base-files/image-config.in4
3 files changed, 6 insertions, 4 deletions
diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index f3bfecaa75..892a31777c 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -11,7 +11,7 @@ include $(INCLUDE_DIR)/kernel.mk
include $(INCLUDE_DIR)/version.mk
PKG_NAME:=base-files
-PKG_RELEASE:=105
+PKG_RELEASE:=106
PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/
PKG_BUILD_DEPENDS:=opkg/host
diff --git a/package/base-files/files/etc/banner b/package/base-files/files/etc/banner
index 3018615682..058cb55733 100644
--- a/package/base-files/files/etc/banner
+++ b/package/base-files/files/etc/banner
@@ -3,7 +3,9 @@
| - || _ | -__| || | | || _|| _|
|_______|| __|_____|__|__||________||__| |____|
|__| W I R E L E S S F R E E D O M
- ATTITUDE ADJUSTMENT (%C, %R) ----------
+ -----------------------------------------------------
+ ATTITUDE ADJUSTMENT (%C, %R)
+ -----------------------------------------------------
* 1/4 oz Vodka Pour all ingredients into mixing
* 1/4 oz Gin tin with ice, strain into glass.
* 1/4 oz Amaretto
diff --git a/package/base-files/image-config.in b/package/base-files/image-config.in
index a9ec76a10b..ac08c8da7c 100644
--- a/package/base-files/image-config.in
+++ b/package/base-files/image-config.in
@@ -145,7 +145,7 @@ menuconfig VERSIONOPT
config VERSION_DIST
string
prompt "Release distribution" if VERSIONOPT
- default "OpenWrt"
+ default "OpenWrt" if VERSIONOPT
help
This is the name of the release distribution.
If unspecified, it defaults to OpenWrt.
@@ -168,7 +168,7 @@ menuconfig VERSIONOPT
config VERSION_REPO
string
prompt "Release repository" if VERSIONOPT
- default "http://downloads.openwrt.org/snapshots/trunk/%T/packages"
+ default "http://downloads.openwrt.org/snapshots/trunk/%T/packages" if VERSIONOPT
help
This is the repository address embedded in the image, it defaults
to the trunk snapshot repo; the url may contain the following placeholders: