From 3de281932617dcad0601ae1851848261875e9bb6 Mon Sep 17 00:00:00 2001 From: floh1111 Date: Sun, 15 Jan 2012 20:23:36 +0000 Subject: [PATCH] =?UTF-8?q?Merging=20r593=20into=20Trunk,=20don=C2=B4t=20f?= =?UTF-8?q?orget=20to=20change=20firmware=20version=20in=20trunk?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build_script.sh | 7 +++++-- root_file_system/default/etc/firmware_release | 2 -- 2 files changed, 5 insertions(+), 4 deletions(-) delete mode 100644 root_file_system/default/etc/firmware_release diff --git a/build_script.sh b/build_script.sh index 7e594d8..d868719 100755 --- a/build_script.sh +++ b/build_script.sh @@ -30,8 +30,9 @@ prepare() { svn export ./build_patches/ar231x/260_fixdmaoffset.patch ./build_dir/target/linux/atheros/patches-2.6.30/260_fixdmaoffset.patch ;; esac - #fix bad switch behaveior: - /bin/rm ./build_dir/target/linux/atheros/base-files/etc/uci-defaults/network + + #fix bad switch behaveior: + /bin/rm ./build_dir/target/linux/atheros/base-files/etc/uci-defaults/network } @@ -86,6 +87,8 @@ configure_build() { esac #insert actual firware version informations into release file + echo "FIRMWARE_VERSION=\"0.3beta4\"" > ./build_dir/files/etc/firmware_release + echo "RELEASE_DATE=\"\"" >> ./build_dir/files/etc/firmware_release echo "FIRMWARE_REVISION=\""`svn info ./ |grep Revision: |cut -c11-`"\"" >> ./build_dir/files/etc/firmware_release echo "OPENWRT_CORE_REVISION=\""`svn info ./build_dir |grep Revision: |cut -c11-`"\"" >> ./build_dir/files/etc/firmware_release echo "OPENWRT_FEEDS_PACKAGES_REVISION=\""`svn info ./build_dir/feeds/packages |grep Revision: |cut -c11-`"\"" >> ./build_dir/files/etc/firmware_release diff --git a/root_file_system/default/etc/firmware_release b/root_file_system/default/etc/firmware_release deleted file mode 100644 index 31ddb40..0000000 --- a/root_file_system/default/etc/firmware_release +++ /dev/null @@ -1,2 +0,0 @@ -FIRMWARE_VERSION="0.3beta3" -RELEASE_DATE="" \ No newline at end of file