Skip to content

Commit

Permalink
chore(build)!: removed unused files and removed vagrant build option. (
Browse files Browse the repository at this point in the history
…#80)

Removed untested and unused Vagrant build option.

Removed .env file, this is not longer needed.

Removed .act file, since act is not able to reproduce all steps
from workflows and exit it with errors it should checked on github itself.

BREAKING CHANGE: Removed Vagrant build option.

If you relay on that method see https://github.com/guysoft/CustomPiOS/wiki/Building-with-Vagrant
for informations, how to setup.

Signed-off-by: Stephan Wendel <me@stephanwe.de>
  • Loading branch information
KwadFan committed Jan 19, 2022
1 parent 83988ea commit 24689fc
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 52 deletions.
4 changes: 0 additions & 4 deletions .actrc

This file was deleted.

1 change: 0 additions & 1 deletion .env

This file was deleted.

30 changes: 6 additions & 24 deletions run.sh
Original file line number Diff line number Diff line change
@@ -1,22 +1,16 @@
#!/bin/bash

##### run.sh - test new image
<<COMMENT
Original by "prg3" ( https://github.com/prg3 ) and "Noms" ( https://github.com/Nomsplease )
Modified by "KwadFan" ( https://github.com/KwadFan )
COMMENT
# Original by "prg3" ( https://github.com/prg3 ) and "Noms" ( https://github.com/Nomsplease )
# Modified by Stephan Wendel aka KwadFan <me@stephanwe.de>

### Configuration
WORKSPACE=src/workspace
IMG_FILE= #if blank, will be detected


## QEMU Parameters
#
# for Kernel Version 4.19.50-buster use
# QEMU_KERNEL='emulation/kernel-qemu-4.19.50-buster'
# QEMU_DTB='emulation/versatile-pb.dtb'
#
# you have also to modify run_image() function!
Expand All @@ -30,9 +24,7 @@ QEMU_DTB='emulation/versatile-pb-buster-5.4.51.dtb'
QEMU_OPTIONS='-no-reboot -nographic'
QEMU_NET='-net user,ipv4=on,ipv6=on,hostfwd=tcp::22222-:22,hostfwd=tcp::8888-:80 -net nic'


### Functions

## Hint
start_hint() {
echo -e "\e[1;30m\n------------------------------------\e[0m"
Expand All @@ -44,7 +36,7 @@ start_hint() {
search_for_qemu() {
for BIN_PATH in $(awk -F':' '{ for(i=1;i<=NF;i++) print $i}' <<< ${PATH})
do
[[ -x $BIN_PATH/$QEMU_BIN ]] && { QEMU_CMD=$BIN_PATH/$QEMU_BIN ; break; }
[[ -x $BIN_PATH/$QEMU_BIN ]] && { QEMU_CMD=$BIN_PATH/$QEMU_BIN ; break; }
done
}

Expand All @@ -63,14 +55,14 @@ check_env() {
then
echo -e "\n\e[1;32m${QEMU_KERNEL}\e[0m missing, exiting..."
exit 2
else
else
echo -e "\n\e[1;32m${QEMU_KERNEL}\e[0m found..."
fi
if [ ! -e $QEMU_DTB ];
then
echo -e "\n\e[1;32m${QEMU_DTB}\e[0m missing, exiting..."
exit 2
else
else
echo -e "\n\e[1;32m${QEMU_DTB}\e[0m found..."
fi
}
Expand Down Expand Up @@ -98,7 +90,7 @@ img_file_handling() {
fi
}

## run image
## run image
run_img() {
qemu-system-arm -cpu $QEMU_CPU -m $QEMU_RAM \
-kernel $QEMU_KERNEL -M $QEMU_MACHINE -dtb \
Expand All @@ -108,16 +100,6 @@ run_img() {
-device "virtio-blk-pci,drive=disk0,disable-modern=on,disable-legacy=off"
}

## run image for Kernel Version 4.19.50-buster
#run_img() {
# qemu-system-arm -cpu $QEMU_CPU -m $QEMU_RAM \
# -kernel $QEMU_KERNEL -M $QEMU_MACHINE -dtb \
# $QEMU_DTB $QEMU_OPTIONS \
# -append 'dwc_otg.lpm_enable=0 root=/dev/sda2 rootfstype=ext4 elevator=deadline fsck.repair=yes rootwait' \
# -drive file=$WORKSPACE/$IMG_FILE,index=0,media=disk,format=raw $QEMU_NET \
#}


### Main
start_hint
search_for_qemu
Expand Down
16 changes: 0 additions & 16 deletions src/vagrant/Vagrantfile

This file was deleted.

3 changes: 0 additions & 3 deletions src/vagrant/run_vagrant_build.sh

This file was deleted.

4 changes: 0 additions & 4 deletions src/vagrant/setup.sh

This file was deleted.

0 comments on commit 24689fc

Please sign in to comment.