Merging r593 into Trunk, don´t forget to change firmware version in trunk

This commit is contained in:
floh1111 2012-01-15 20:23:36 +00:00
parent 7b0e2a7e33
commit 3de2819326
2 changed files with 5 additions and 4 deletions

View File

@ -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

View File

@ -1,2 +0,0 @@
FIRMWARE_VERSION="0.3beta3"
RELEASE_DATE=""