From: Arne Fitzenreiter Date: Tue, 2 Jun 2020 16:37:22 +0000 (+0200) Subject: drop xen-inage-builder X-Git-Tag: v2.25-core146~22 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5b0c35e092adf328d0692d8466aac3ba27c524b7;p=ipfire-2.x.git drop xen-inage-builder this depends on linux-pae and has failed to boot since a while. Signed-off-by: Arne Fitzenreiter --- diff --git a/config/xen-image/README b/config/xen-image/README deleted file mode 100644 index 159b036ceb..0000000000 --- a/config/xen-image/README +++ /dev/null @@ -1,25 +0,0 @@ -How to install Ipfire as a Xen DomU: - -- run xen-image-maker.sh to download and build the xen-images. - you need to be root because the skript do some loop mounts. - The script need wget and gpg for download and decode ipfire packages. - -- edit the file ipfire.cfg -- start ipfire: "xm create ipfire.cfg" -- if you get no errormessage go to console: "xm console ipfire-xen" -- after booting, the setup will started to do basic settings and reboot - (Ignore the errormessages. The services are not startet yet) - -This setup is for 2 interfaces (green and red). -If you want more, like orange and blue, edit the ipfire.cfg and execute -"setup" to adjust yout config. - -other usefull commands from the Dom0: -- shutdown the fire: "xm shutdown ipfire-xen" -- reset the fire: "xm destroy ipfire-xen" -- look what is going on: "xm top" or "xm list" - -This script can also build a Citrix XenCenter xva image. (Need xz-aware -xen version. Tested with Citrix Xen Server 6.5) -- run "XEN_IMG_TYPE=xva bash xen-image-maker.sh" to build an xva image. -- import the vm with "xe vm-import filename=ipfire.xva" diff --git a/config/xen-image/ipfire.cfg b/config/xen-image/ipfire.cfg deleted file mode 100644 index 3d2ab311ce..0000000000 --- a/config/xen-image/ipfire.cfg +++ /dev/null @@ -1,23 +0,0 @@ -bootloader = '/usr/bin/pygrub' - -memory = 512 -name = "ipfire-xen" - -acpi=1 -apic=1 - -### network: do not change the mac adresses and never use your real mac adresse of your hardware here!! ### -### the bridge must be present on you xen-system. Check the names!!! ### -vif = [ - 'mac=00:17:3E:BE:A1:1A, bridge=xenbrI', ## Green - 'mac=00:17:3E:BE:A1:1B, bridge=xenbrE', ## Red -# 'mac=00:17:3E:BE:A1:1C, bridge=xenbrW', ## Blue (currently disabled, uncomment it if neede) -# 'mac=00:17:3E:BE:A1:1D, bridge=xenbrD' ## Orange (currently disabled, uncomment it if neede) - ] - - -disk = [ - 'file:./ipfire-boot.img,xvda1,w', - 'file:./ipfire-swap.img,xvda2,w', - 'file:./ipfire-root.img,xvda3,w' - ] #### Change path diff --git a/config/xen-image/xen-image-maker.sh b/config/xen-image/xen-image-maker.sh deleted file mode 100644 index ae20f295a1..0000000000 --- a/config/xen-image/xen-image-maker.sh +++ /dev/null @@ -1,204 +0,0 @@ -#/bin/bash -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 Arne Fitzenreiter # -# # -# This program is free software: you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation, either version 3 of the License, or # -# (at your option) any later version. # -# # -# This program is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with this program. If not, see . # -# # -############################################################################### - -SNAME=xxxSNAMExxx -VERSION=xxxVERSIONxxx -CORE=xxxCORExxx - -KERN_TYPE=pae -KVER=xxxKVERxxx -KERN_PACK=xxxKERN_PACKxxx -KRNDOWN=http://mirror0.ipfire.org/pakfire2/$VERSION/paks -CONSOLE=hvc0 - -SIZEboot=128 -SIZEswap=512 -SIZEroot=3072 -FSTYPE=ext3 - -############################################################################## - -SOURCEISO=$SNAME-$VERSION.i586-full-core$CORE.iso -HTTPDIR=https://downloads.ipfire.org/releases/ipfire-2.x/$VERSION-core$CORE - -TMPDIR=./ipfire-tmp -ISODIR=$TMPDIR/iso -MNThdd=$TMPDIR/harddisk - -IMGboot=./$SNAME-boot.img -IMGswap=./$SNAME-swap.img -IMGroot=./$SNAME-root.img - -KERNEL=linux-$KERN_TYPE-$KVER-$KERN_PACK.ipfire - -if [ "$XEN_IMG_TYPE" == "xva" ]; then - # download xva.py if it not exist. - if [ ! -e xva.py ]; then - wget https://source.ipfire.org/source-2.x/xva.py - fi - # XenCenter use other devicenames and - # xvdd seems to be reserved (converter bug?). - P1=xvda - P2=xvdb - P3=xvdc -else - # old style xen image partition names - P1=xvda1 - P2=xvda2 - P3=xvda3 -fi - -rm -rf $TMPDIR && mkdir -p $MNThdd && mkdir -p $ISODIR -echo -------------------------------------------------------- -echo - Download $SOURCEISO ... -echo -------------------------------------------------------- -wget $HTTPDIR/$SOURCEISO -O $TMPDIR/$SOURCEISO -mount -o loop $TMPDIR/$SOURCEISO $ISODIR - -echo -------------------------------------------------------- -echo - Download $KERNEL ... -echo -------------------------------------------------------- -wget $KRNDOWN/$KERNEL -O $TMPDIR/$KERNEL.gpg -gpg -d $TMPDIR/$KERNEL.gpg > $TMPDIR/$KERNEL - -echo -------------------------------------------------------- -echo - Create Images ... -echo -------------------------------------------------------- - -#Create bootimage -dd bs=1M if=/dev/zero of=$IMGboot count=$SIZEboot -mkfs.ext2 -F $IMGboot - -#Create swapimage -dd bs=1M if=/dev/zero of=$IMGswap count=$SIZEswap -mkswap $IMGswap - -#Create rootimage -dd bs=1M if=/dev/zero of=$IMGroot count=$SIZEroot -mkfs.$FSTYPE -F $IMGroot - -echo -------------------------------------------------------- -echo - Install IPFire to the images ... -echo -------------------------------------------------------- - -# Mount Images -mount -o loop $IMGroot $MNThdd -mkdir $MNThdd/boot -mkdir $MNThdd/var -mkdir $MNThdd/var/log -mount -o loop $IMGboot $MNThdd/boot - -# Install IPFire without kernel modules -xz -d < $ISODIR/distro.img > $TMPDIR/$SNAME-$VERSION.tar -tar -C $MNThdd/ -xvf $TMPDIR/$SNAME-$VERSION.tar \ - --exclude=lib/modules* --exclude=boot* --numeric-owner - -#Install Kernel -mkdir $MNThdd/proc -mkdir $MNThdd/boot/grub -echo "flags : pae " > $MNThdd/proc/cpuinfo # fake pae detection -tar -C $MNThdd/opt/pakfire/tmp -xvf $TMPDIR/$KERNEL --numeric-owner -chroot $MNThdd /opt/pakfire/tmp/install.sh -rm -rf $MNThdd/opt/pakfire/tmp/* -rm -rf $MNThdd/proc/cpuinfo - -#Create grub menuentry for pygrub -echo "timeout 10" > $MNThdd/boot/grub/grub.conf -echo "default 0" >> $MNThdd/boot/grub/grub.conf -echo "title IPFire ($KERN_TYPE-kernel)" >> $MNThdd/boot/grub/grub.conf -echo " root (hd0)" >> $MNThdd/boot/grub/grub.conf -echo " kernel /vmlinuz-$KVER-ipfire-$KERN_TYPE root=/dev/$P3 rootdelay=10 panic=10 console=$CONSOLE" \ - >> $MNThdd/boot/grub/grub.conf -echo " initrd /initramfs-$KVER-ipfire-$KERN_TYPE.img" >> $MNThdd/boot/grub/grub.conf -echo "# savedefault 0" >> $MNThdd/boot/grub/grub.conf - -ln -s grub.conf $MNThdd/boot/grub/menu.lst - -#create the meta-info of linux-kernel package -echo "" > $MNThdd/opt/pakfire/db/meta/meta-linux-$KERN_TYPE -echo "Name: linux-$KERN_TYPE" >> $MNThdd/opt/pakfire/db/meta/meta-linux-$KERN_TYPE -echo "ProgVersion: $KVER" >> $MNThdd/opt/pakfire/db/meta/meta-linux-$KERN_TYPE -echo "Release: $KERN_PACK" >> $MNThdd/opt/pakfire/db/meta/meta-linux-$KERN_TYPE -echo "" >> $MNThdd/opt/pakfire/db/meta/meta-linux-$KERN_TYPE -echo "" > $MNThdd/opt/pakfire/db/installed/meta-linux-$KERN_TYPE -echo "Name: linux-$KERN_TYPE" >> $MNThdd/opt/pakfire/db/installed/meta-linux-$KERN_TYPE -echo "ProgVersion: $KVER" >> $MNThdd/opt/pakfire/db/installed/meta-linux-$KERN_TYPE -echo "Release: $KERN_PACK" >> $MNThdd/opt/pakfire/db/installed/meta-linux-$KERN_TYPE -echo "" >> $MNThdd/opt/pakfire/db/installed/meta-linux-$KERN_TYPE - -#Set default configuration -echo "LANGUAGE=en" >> $MNThdd/var/ipfire/main/settings -echo "HOSTNAME=$SNAME" >> $MNThdd/var/ipfire/main/settings -echo "THEME=ipfire" >> $MNThdd/var/ipfire/main/settings -touch $MNThdd/lib/modules/$KVER-ipfire-$KERN_TYPE/modules.dep -mount --bind /proc $MNThdd/proc -mount --bind /dev $MNThdd/dev -mount --bind /sys $MNThdd/sys -chroot $MNThdd /usr/bin/perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" - -# create fstab -echo "/dev/$P1 /boot auto defaults 1 3" > $MNThdd/etc/fstab -echo "/dev/$P2 swap swap defaults 0 0" >> $MNThdd/etc/fstab -echo "/dev/$P3 / auto defaults 1 1" >> $MNThdd/etc/fstab - - -#Remove root / fstab check -rm -rf $MNThdd/etc/rc.d/rcsysinit.d/S19checkfstab -#Remove console init -rm -rf $MNThdd/etc/rc.d/rcsysinit.d/S70console - -#Add console to securetty -echo $CONSOLE >> $MNThdd/etc/securetty - -#Add getty for console -echo "#Enable login for XEN" >> $MNThdd/etc/inittab -echo "8:2345:respawn:/sbin/agetty $CONSOLE 9600 --noclear" >> $MNThdd/etc/inittab - -#Disable some initskripts -echo "#!/bin/sh" > $MNThdd/etc/rc.d/init.d/setclock -echo "#!/bin/sh" > $MNThdd/etc/rc.d/init.d/keymap - -#Remove autoload of acpi modules -sed -i -e "s|^ac|#ac|g" $MNThdd/etc/sysconfig/modules -sed -i -e "s|^battery|#battery|g" $MNThdd/etc/sysconfig/modules -sed -i -e "s|^button|#button|g" $MNThdd/etc/sysconfig/modules -sed -i -e "s|^fan|#fan|g" $MNThdd/etc/sysconfig/modules -sed -i -e "s|^processor|#processor|g" $MNThdd/etc/sysconfig/modules -sed -i -e "s|^thermal|#thermal|g" $MNThdd/etc/sysconfig/modules -sed -i -e "s|^video|#video|g" $MNThdd/etc/sysconfig/modules - -# Unmount -umount $MNThdd/proc -umount $MNThdd/dev -umount $MNThdd/sys -umount $MNThdd/boot -umount $MNThdd - -umount $ISODIR -rm -rf ./ipfire-tmp - -if [ "$XEN_IMG_TYPE" == "xva" ]; then - python xva.py --sparse -c $SNAME.cfg -f $SNAME.xva - rm -f $SNAME*.img -fi -echo -------------------------------------------------------- -echo - Done. -echo -------------------------------------------------------- diff --git a/lfs/xen-image b/lfs/xen-image deleted file mode 100644 index 7590846bf3..0000000000 --- a/lfs/xen-image +++ /dev/null @@ -1,69 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team # -# # -# This program is free software: you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation, either version 3 of the License, or # -# (at your option) any later version. # -# # -# This program is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with this program. If not, see . # -# # -############################################################################### - -############################################################################### -# Definitions -############################################################################### - -include Config - -VER = ipfire - -THISAPP = xen-image -TARGET = $(DIR_INFO)/$(THISAPP) -SUP_ARCH = i586 - -KERN_PACK = `grep "^PAK_VER " $(DIR_SRC)/lfs/linux | sed "s| ||g" | cut -d"=" -f2` - -############################################################################### -# Top-level Rules -############################################################################### - -install : $(TARGET) - -check : - -download : - -md5 : - -############################################################################### -# Installation Details -############################################################################### -IMGinst := /install/images/$(SNAME)-$(VERSION).xen.$(BUILD_ARCH)-downloader-core$(CORE).tar.bz2 - -$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) - rm -rf /install/images/$(SNAME) $(IMGinst) && mkdir -p /install/images/$(SNAME) - - # Copy readme and config - cp $(DIR_SRC)/config/xen-image/* \ - /install/images/$(SNAME) - - # configure image downloader - sed -i -e "s/xxxSNAMExxx/$(SNAME)/" /install/images/$(SNAME)/xen-image-maker.sh - sed -i -e "s/xxxVERSIONxxx/$(VERSION)/" /install/images/$(SNAME)/xen-image-maker.sh - sed -i -e "s/xxxCORExxx/$(CORE)/" /install/images/$(SNAME)/xen-image-maker.sh - sed -i -e "s/xxxKVERxxx/$(KVER)/" /install/images/$(SNAME)/xen-image-maker.sh - sed -i -e "s/xxxKERN_PACKxxx/$(KERN_PACK)/" /install/images/$(SNAME)/xen-image-maker.sh - - # Compress Image - cd /install/images/ && tar -cvjf $(IMGinst) $(SNAME) - - rm -rf $(MNThdd) /install/images/$(SNAME) diff --git a/make.sh b/make.sh index 1818532cd7..b949058806 100755 --- a/make.sh +++ b/make.sh @@ -1690,9 +1690,6 @@ buildpackages() { ipfirepackages - lfsmake2 xen-image - mv $LFS/install/images/*.bz2 $BASEDIR >> $LOGFILE 2>&1 - cd $BASEDIR # remove not useable iso on armv5tel (needed to build flash images)