[commit] BSDanywhere - r249 - branches/stephan

[bsdan...@startek.ch]

Author: stephan
Date: Sat Dec 13 20:01:46 2008
New Revision: 249

Log:
No longer install self-made kernels. OpenBSD can now use a CD based root file system by default. This is a huge step forward since dmesg's and bug reports based on official kernels are more likeley to be accepted by OpenBSD developers. Big thanks go to krw@ who implemented my suggestion at OpenCON.

Modified:
branches/stephan/build.sh

Modified: branches/stephan/build.sh
==============================================================================
--- branches/stephan/build.sh (original)
+++ branches/stephan/build.sh Sat Dec 13 20:01:46 2008
@@ -44,9 +44,8 @@
export IMAGE_ROOT=$BASE/image
export CACHE_ROOT=$BASE/cache

-export MIRROR1=http://mirror.switch.ch/ftp/pub/OpenBSD
-export MIRROR2=http://mirror.startek.ch
-export PKG_PATH=$MIRROR1/$RELEASE/packages/$ARCH/:$MIRROR2/OpenBSD/packages/$RELEASE/$ARCH/
+export MIRROR=http://mirror.switch.ch/ftp/pub/OpenBSD
+export PKG_PATH=$MIRROR/$RELEASE/packages/$ARCH/:http://mirror.startek.ch/OpenBSD/packages/$RELEASE/$ARCH/

export CWD=$(pwd)
export THIS_OS=$(uname)
@@ -138,24 +137,13 @@
echo done
}

-# Get custom kernels.
-install_custom_kernels() {
- for i in bsd bsd.mp
- do
- test -r $CACHE_ROOT/$i || \
- ftp -o $CACHE_ROOT/$i $MIRROR2/BSDanywhere/$RELEASE/$ARCH/$i
- echo -n "Installing $i ... "
- cp -p $CACHE_ROOT/$i $IMAGE_ROOT/
- echo done
- done
-}

-# Get generic boot loaders.
+# Get generic kernels and boot loaders.
install_boot_files() {
- for i in cdbr cdboot
+ for i in bsd bsd.mp cdbr cdboot
do
test -r $CACHE_ROOT/$i || \
- ftp -o $CACHE_ROOT/$i $MIRROR1/$RELEASE/$ARCH/$i
+ ftp -o $CACHE_ROOT/$i $MIRROR/$RELEASE/$ARCH/$i
echo -n "Installing $i ... "
cp -p $CACHE_ROOT/$i $IMAGE_ROOT/
echo done
@@ -167,7 +155,7 @@
for i in base game man misc etc xbase xetc xfont xserv xshare
do
test -r $CACHE_ROOT/$i$R.tgz || \
- ftp -o $CACHE_ROOT/$i$R.tgz $MIRROR1/$RELEASE/$ARCH/$i$R.tgz
+ ftp -o $CACHE_ROOT/$i$R.tgz $MIRROR/$RELEASE/$ARCH/$i$R.tgz
echo -n "Installing $i ... "
tar -C $IMAGE_ROOT -xzphf $CACHE_ROOT/$i$R.tgz
echo done
@@ -188,7 +176,6 @@
[ $? = 0 ] || exit 1

prepare_build
-install_custom_kernels
install_boot_files
install_filesets
prepare_filesystem