webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-27 03:07:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into fifteen

Browse Source
This commit is contained in:
Arne Fitzenreiter
2013-09-15 18:42:33 +02:00
parent 7284262a5e 4accbf9369
commit 5a6804a247
19 changed files with 288 additions and 6433 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
make.sh
View File

@@ -32,7 +32,7 @@ SLOGAN="www.ipfire.org" # Software slogan
CONFIG_ROOT=/var/ipfire # Configuration rootdir
NICE=10 # Nice level
MAX_RETRIES=1 # prefetch/check loop
BUILD_IMAGES=1 # Build USB, Flash and Xen Images
BUILD_IMAGES=1 # Flash and Xen Downloader
KVER=`grep --max-count=1 VER lfs/linux | awk '{ print $3 }'`
MACHINE=`uname -m`
GIT_TAG=$(git tag | tail -1) # Git Tag
@@ -383,19 +383,6 @@ buildipfire() {
if [ "${MACHINE_TYPE}" != "arm" ]; then
# x86-xen (Legacy XEN) kernel build
ipfiremake linux2 KCFG="-xen"
ipfiremake v4l-dvb KCFG="-xen"
ipfiremake mISDN KCFG="-xen"
ipfiremake cryptodev KCFG="-xen"
ipfiremake compat-drivers KCFG="-xen"
ipfiremake r8169 KCFG="-xen"
ipfiremake r8168 KCFG="-xen"
ipfiremake r8101 KCFG="-xen"
ipfiremake e1000 KCFG="-xen"
ipfiremake e1000e KCFG="-xen"
ipfiremake igb KCFG="-xen"
# x86-pae (Native and new XEN) kernel build
ipfiremake linux KCFG="-pae"
# ipfiremake kvm-kmod KCFG="-pae"
@@ -852,9 +839,6 @@ buildpackages() {
# Check if there is a loop device for building in virtual environments
if [ $BUILD_IMAGES == 1 ] && ([ -e /dev/loop/0 ] || [ -e /dev/loop0 ]); then
if [ "${MACHINE_TYPE}" != "arm" ]; then
ipfiremake usb-stick
fi
ipfiremake flash-images
fi
@@ -862,16 +846,7 @@ buildpackages() {
ipfirepackages
# Check if there is a loop device for building in virtual environments
if [ $BUILD_IMAGES == 1 ] && ([ -e /dev/loop/0 ] || [ -e /dev/loop0 ]) && [ "${MACHINE_TYPE}" != "arm" ]; then
cp -f $BASEDIR/packages/linux-xen-*.ipfire $LFS/install/packages/
cp -f $BASEDIR/packages/meta-linux-xen $LFS/install/packages/
cp -f $BASEDIR/packages/linux-pae-*.ipfire $LFS/install/packages/
cp -f $BASEDIR/packages/meta-linux-pae $LFS/install/packages/
ipfiremake xen-image
rm -rf $LFS/install/packages/linux-xen-*.ipfire
rm -rf $LFS/install/packages/meta-linux-xen
fi
ipfiremake xen-image
mv $LFS/install/images/*.bz2 $BASEDIR >> $LOGFILE 2>&1
cd $BASEDIR