From ffb19dad5fd523bba2d9d465cee7c077f832f1cc Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sat, 4 Oct 2008 18:30:37 +0200 Subject: [PATCH] change version to beta4 / core19 --- config/rootfiles/cdrom_corever | 3 +-- config/rootfiles/updater/update.sh | 2 +- lfs/updater | 8 ++++---- make.sh | 2 +- src/scripts/backupiso | 8 ++++---- 5 files changed, 11 insertions(+), 12 deletions(-) diff --git a/config/rootfiles/cdrom_corever b/config/rootfiles/cdrom_corever index 0cd525d8cb..d6b24041cf 100644 --- a/config/rootfiles/cdrom_corever +++ b/config/rootfiles/cdrom_corever @@ -1,2 +1 @@ -18 - +19 diff --git a/config/rootfiles/updater/update.sh b/config/rootfiles/updater/update.sh index b16a0968d4..b22b6cd799 100755 --- a/config/rootfiles/updater/update.sh +++ b/config/rootfiles/updater/update.sh @@ -235,7 +235,7 @@ echo '/opt/pakfire/pakfire update -y --force' >> /tmp/remove_obsolet echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/remove_obsolete_paks echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/remove_obsolete_paks echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/remove_obsolete_paks -echo 'logger -p syslog.emerg -t core-upgrade-18 "Upgrade finished. Please reboot... "' >> /tmp/remove_obsolete_paks +echo 'logger -p syslog.emerg -t core-upgrade-19 "Upgrade finished. Please reboot... "' >> /tmp/remove_obsolete_paks # chmod +x /tmp/remove_obsolete_paks /tmp/remove_obsolete_paks & diff --git a/lfs/updater b/lfs/updater index 5df5222c50..f743730001 100644 --- a/lfs/updater +++ b/lfs/updater @@ -70,13 +70,13 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) # Other files cp $(DIR_SRC)/config/rootfiles/updater/update.sh /install/updater/ chmod 755 /install/updater/update.sh - cd /install/updater && tar cf /install/packages/core-upgrade-2.1-18.ipfire \ + cd /install/updater && tar cf /install/packages/core-upgrade-2.1-19.ipfire \ update.sh files ROOTFILES rm -rf /install/updater sed -e "s/NAME/core-upgrade/g" \ -e "s/VER/2.1/g" \ - -e "s/RELEASE/18/g" \ + -e "s/RELEASE/19/g" \ -e "s/DEPS/$(DEPS)/g" \ - -e "s/SIZE/`ls -l \/install\/packages\/core-upgrade-2.1-18.ipfire | awk '{ print $$5 }'`/g" \ - < /usr/src/src/pakfire/meta > /install/packages/meta-core-upgrade-18 + -e "s/SIZE/`ls -l \/install\/packages\/core-upgrade-2.1-19.ipfire | awk '{ print $$5 }'`/g" \ + < /usr/src/src/pakfire/meta > /install/packages/meta-core-upgrade-19 diff --git a/make.sh b/make.sh index 1dce1ecb0b..31a1e13c0c 100755 --- a/make.sh +++ b/make.sh @@ -24,7 +24,7 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name -VERSION="2.3-test" +VERSION="2.3-beta4" GIT_BRANCH=master:master # Version number SLOGAN="www.ipfire.org" # Software slogan CONFIG_ROOT=/var/ipfire # Configuration rootdir diff --git a/src/scripts/backupiso b/src/scripts/backupiso index 6be63bf0ea..ca3f42e18b 100644 --- a/src/scripts/backupiso +++ b/src/scripts/backupiso @@ -1,10 +1,10 @@ #!/bin/sh # FIXME: edit this lines before release -#URL=http://download.ipfire.org/iso/ -#ISO=ipfire-2.3-beta4.i586-full.iso -URL=http://www.rowie.at/ipfire/builds/v2.3test/Beta3/20081001-17uhr/ -ISO=ipfire-2.3-test.i586-full.iso +URL=http://download.ipfire.org/iso/ +ISO=ipfire-2.3-beta4.i586-full.iso +#URL=http://www.rowie.at/ipfire/builds/v2.3test/Beta3/20081001-17uhr/ +#ISO=ipfire-2.3-test.i586-full.iso if [ -z "$1" ]; then echo usage: $0 backup-file -- 2.39.2