mirror of
https://github.com/Fishwaldo/build.git
synced 2025-06-27 16:49:00 +00:00
Removed Jessie from list of supported build hosts
Small cleanup
This commit is contained in:
zador-blood-stained
parent
94194dc065
commit
281276d233
4 changed files with 16 additions and 33 deletions
24
common.sh
24
common.sh
|
|
@ -42,9 +42,9 @@ compile_uboot (){
|
|||
${PROGRESS_LOG_TO_FILE:+' | tee -a $DEST/debug/compilation.log'} \
|
||||
${OUTPUT_VERYSILENT:+' >/dev/null 2>/dev/null'}
|
||||
|
||||
[ -f .config ] && sed -i 's/CONFIG_LOCALVERSION=""/CONFIG_LOCALVERSION="-armbian"/g' .config
|
||||
[ -f .config ] && sed -i 's/CONFIG_LOCALVERSION_AUTO=.*/# CONFIG_LOCALVERSION_AUTO is not set/g' .config
|
||||
[ -f $SOURCES/$BOOTSOURCEDIR/tools/logos/udoo.bmp ] && cp $SRC/lib/bin/armbian-u-boot.bmp $SOURCES/$BOOTSOURCEDIR/tools/logos/udoo.bmp
|
||||
[[ -f .config ]] && sed -i 's/CONFIG_LOCALVERSION=""/CONFIG_LOCALVERSION="-armbian"/g' .config
|
||||
[[ -f .config ]] && sed -i 's/CONFIG_LOCALVERSION_AUTO=.*/# CONFIG_LOCALVERSION_AUTO is not set/g' .config
|
||||
[[ -f $SOURCES/$BOOTSOURCEDIR/tools/logos/udoo.bmp ]] && cp $SRC/lib/bin/armbian-u-boot.bmp $SOURCES/$BOOTSOURCEDIR/tools/logos/udoo.bmp
|
||||
touch .scmversion
|
||||
|
||||
# patch mainline uboot configuration to boot with old kernels
|
||||
|
|
@ -132,10 +132,10 @@ END
|
|||
[ ! -f "sd_fuse/hardkernel/tzsw.bin.hardkernel" ] || cp sd_fuse/hardkernel/tzsw.bin.hardkernel $DEST/debs/$uboot_name/usr/lib/$uboot_name
|
||||
[ ! -f "u-boot.bin" ] || cp u-boot.bin $DEST/debs/$uboot_name/usr/lib/$uboot_name/
|
||||
elif [[ $BOARD == odroidc1 ]] ; then
|
||||
[ ! -f "sd_fuse/bl1.bin.hardkernel" ] || cp sd_fuse/bl1.bin.hardkernel $DEST/debs/$uboot_name/usr/lib/$uboot_name
|
||||
[ ! -f "sd_fuse/bl1.bin.hardkernel" ] || cp sd_fuse/bl1.bin.hardkernel $DEST/debs/$uboot_name/usr/lib/$uboot_name
|
||||
[ ! -f "sd_fuse/u-boot.bin" ] || cp sd_fuse/u-boot.bin $DEST/debs/$uboot_name/usr/lib/$uboot_name
|
||||
elif [[ $BOARD == odroidc2 ]] ; then
|
||||
[ ! -f "sd_fuse/bl1.bin.hardkernel" ] || cp sd_fuse/bl1.bin.hardkernel $DEST/debs/$uboot_name/usr/lib/$uboot_name
|
||||
[ ! -f "sd_fuse/bl1.bin.hardkernel" ] || cp sd_fuse/bl1.bin.hardkernel $DEST/debs/$uboot_name/usr/lib/$uboot_name
|
||||
[ ! -f "sd_fuse/u-boot.bin" ] || cp sd_fuse/u-boot.bin $DEST/debs/$uboot_name/usr/lib/$uboot_name
|
||||
elif [[ $BOARD == udoo* ]] ; then
|
||||
[ ! -f "u-boot.img" ] || cp SPL u-boot.img $DEST/debs/$uboot_name/usr/lib/$uboot_name
|
||||
|
|
@ -233,8 +233,8 @@ compile_kernel (){
|
|||
${OUTPUT_DIALOG:+' | dialog --backtitle "$backtitle" --progressbox "Compiling kernel..." $TTY_Y $TTY_X'} \
|
||||
${OUTPUT_VERYSILENT:+' >/dev/null 2>/dev/null'}
|
||||
|
||||
if [ ${PIPESTATUS[0]} -ne 0 ] || [ ! -f arch/$ARCHITECTURE/boot/$TARGETS ]; then
|
||||
exit_with_error "Kernel was not built" "@host"
|
||||
if [[ ${PIPESTATUS[0]} -ne 0 || ! -f arch/$ARCHITECTURE/boot/$TARGETS ]]; then
|
||||
exit_with_error "Kernel was not built" "@host"
|
||||
fi
|
||||
|
||||
# different packaging for 4.3+ // probably temporaly soution
|
||||
|
|
@ -392,7 +392,7 @@ for plugin in $SRC/lib/extras/*.sh; do
|
|||
done
|
||||
|
||||
# MISC5 = sunxi display control
|
||||
if [[ -n "$MISC5_DIR" && $BRANCH != "next" && $LINUXSOURCEDIR == *sunxi* ]]; then
|
||||
if [[ -n $MISC5_DIR && $BRANCH != next && $LINUXSOURCEDIR == *sunxi* ]]; then
|
||||
cd "$SOURCES/$MISC5_DIR"
|
||||
cp "$SOURCES/$LINUXSOURCEDIR/include/video/sunxi_disp_ioctl.h" .
|
||||
make clean >/dev/null
|
||||
|
|
@ -401,7 +401,7 @@ if [[ -n "$MISC5_DIR" && $BRANCH != "next" && $LINUXSOURCEDIR == *sunxi* ]]; the
|
|||
fi
|
||||
|
||||
# MISC5 = sunxi display control / compile it for sun8i just in case sun7i stuff gets ported to sun8i and we're able to use it
|
||||
if [[ -n "$MISC5_DIR" && $BRANCH != "next" && $LINUXSOURCEDIR == *sun8i* ]]; then
|
||||
if [[ -n $MISC5_DIR && $BRANCH != next && $LINUXSOURCEDIR == *sun8i* ]]; then
|
||||
cd "$SOURCES/$MISC5_DIR"
|
||||
wget -q "https://raw.githubusercontent.com/linux-sunxi/linux-sunxi/sunxi-3.4/include/video/sunxi_disp_ioctl.h"
|
||||
make clean >/dev/null 2>&1
|
||||
|
|
@ -410,7 +410,7 @@ if [[ -n "$MISC5_DIR" && $BRANCH != "next" && $LINUXSOURCEDIR == *sun8i* ]]; the
|
|||
fi
|
||||
|
||||
# h3disp/sun8i-corekeeper.sh for sun8i/3.4.x
|
||||
if [ "${LINUXFAMILY}" = "sun8i" -a "${BRANCH}" = "default" ]; then
|
||||
if [[ $LINUXFAMILY == sun8i && $BRANCH == default ]]; then
|
||||
install -m 755 "$SRC/lib/scripts/h3disp" "$CACHEDIR/sdcard/usr/local/bin"
|
||||
install -m 755 "$SRC/lib/scripts/sun8i-corekeeper.sh" "$CACHEDIR/sdcard/usr/local/bin"
|
||||
sed -i 's|^exit\ 0$|/usr/local/bin/sun8i-corekeeper.sh \&\n\n&|' "$CACHEDIR/sdcard/etc/rc.local"
|
||||
|
|
@ -459,9 +459,7 @@ write_uboot()
|
|||
( dd if=/dev/zero of=$LOOP bs=1k count=1023 seek=1 status=noxfer ) > /dev/null 2>&1
|
||||
( dd if=/tmp/usr/lib/${CHOSEN_UBOOT}_${REVISION}_${ARCH}/u-boot-sunxi-with-spl.bin of=$LOOP bs=1024 seek=8 status=noxfer >/dev/null 2>&1)
|
||||
fi
|
||||
if [ $? -ne 0 ]; then
|
||||
exit_with_error "U-boot failed to install" "@host"
|
||||
fi
|
||||
[[ $? -ne 0 ]] && exit_with_error "U-boot failed to install" "@host"
|
||||
rm -r /tmp/usr
|
||||
sync
|
||||
}
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ install_usb_redirector()
|
|||
IFS='.' read -a array <<< "$VER"
|
||||
# Current USB redirector is broken for old kernels
|
||||
cd $SOURCES
|
||||
if (( "${array[0]}" == "4" )) && (( "${array[1]}" >= "1" )); then
|
||||
if (( "${array[0]}" == "4" )) && (( "${array[1]}" >= "1" )); then
|
||||
wget -q http://www.incentivespro.com/usb-redirector-linux-arm-eabi.tar.gz
|
||||
else
|
||||
cp $SRC/lib/bin/usb-redirector-old.tgz usb-redirector-linux-arm-eabi.tar.gz
|
||||
|
|
@ -41,9 +41,5 @@ install_usb_redirector()
|
|||
# chroot $CACHEDIR/sdcard /bin/bash -c "update-rc.d rc.usbsrvd defaults
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
display_alert "Installing additional application" "USB redirector" "info"
|
||||
install_usb_redirector
|
||||
|
||||
|
|
|
|||
13
general.sh
13
general.sh
|
|
@ -296,22 +296,12 @@ prepare_host() {
|
|||
if [[ $NO_APT_CACHER != yes ]]; then PAK="$PAK apt-cacher-ng"; fi
|
||||
|
||||
local codename=$(lsb_release -sc)
|
||||
if [[ $codename == "" || "jessie trusty wily xenial" != *"$codename"* ]]; then
|
||||
if [[ $codename == "" || "trusty wily xenial" != *"$codename"* ]]; then
|
||||
display_alert "Host system support was not tested" "${codename:-(unknown)}" "wrn"
|
||||
echo -e "Press \e[0;33m<Ctrl-C>\x1B[0m to abort compilation, \e[0;33m<Enter>\x1B[0m to ignore and continue"
|
||||
read
|
||||
fi
|
||||
|
||||
if [[ $codename == jessie ]]; then
|
||||
PAK="$PAK crossbuild-essential-armhf crossbuild-essential-armel";
|
||||
if [[ ! -f /etc/apt/sources.list.d/crosstools.list ]]; then
|
||||
display_alert "Adding repository for jessie" "cross-tools" "info"
|
||||
dpkg --add-architecture armhf > /dev/null 2>&1
|
||||
echo 'deb http://emdebian.org/tools/debian/ jessie main' > /etc/apt/sources.list.d/crosstools.list
|
||||
wget 'http://emdebian.org/tools/debian/emdebian-toolchain-archive.key' -O - | apt-key add - >/dev/null
|
||||
fi
|
||||
fi
|
||||
|
||||
if [[ $codename == trusty ]]; then
|
||||
PAK="$PAK libc6-dev-armhf-cross libc6-dev-armel-cross";
|
||||
if [[ ! -f /etc/apt/sources.list.d/aptly.list ]]; then
|
||||
|
|
@ -322,7 +312,6 @@ prepare_host() {
|
|||
fi
|
||||
|
||||
if [[ $codename == wily || $codename == xenial ]]; then
|
||||
# gcc-4.9-arm-linux-gnueabihf gcc-4.9-arm-linux-gnueabi
|
||||
PAK="$PAK libc6-dev-armhf-cross libc6-dev-armel-cross"
|
||||
fi
|
||||
|
||||
|
|
|
|||
6
main.sh
6
main.sh
|
|
@ -54,7 +54,7 @@ rm -rf $DEST/debs/*/*/
|
|||
|
||||
# Script parameters handling
|
||||
for i in "$@"; do
|
||||
if [[ "$i" == *"="* ]]; then
|
||||
if [[ $i == *=* ]]; then
|
||||
parameter=${i%%=*}
|
||||
value=${i##*=}
|
||||
display_alert "Command line: setting $parameter to" "${value:-(empty)}" "info"
|
||||
|
|
@ -63,9 +63,9 @@ for i in "$@"; do
|
|||
done
|
||||
|
||||
if [[ $PROGRESS_DISPLAY == none ]]; then
|
||||
OUTPUT_VERYSILENT=yes;
|
||||
OUTPUT_VERYSILENT=yes
|
||||
elif [[ $PROGRESS_DISPLAY != plain ]]; then
|
||||
OUTPUT_DIALOG=yes;
|
||||
OUTPUT_DIALOG=yes
|
||||
fi
|
||||
if [[ $PROGRESS_LOG_TO_FILE != yes ]]; then unset PROGRESS_LOG_TO_FILE; fi
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue