Permalink
Browse files

Differentiate between stable and nightly images

  • Loading branch information...
1 parent 1ffc7ca commit 612e134e4fd0804efb1ddc7094a0c224e4171c21 @zador-blood-stained zador-blood-stained committed Jan 4, 2017
Showing with 22 additions and 7 deletions.
  1. +1 −1 build-all.sh
  2. +4 −4 compile.sh
  3. +6 −0 main.sh
  4. +1 −0 makeboarddeb.sh
  5. +9 −1 scripts/check_first_login.sh
  6. +1 −1 scripts/update-motd.d/10-header
View
@@ -201,7 +201,7 @@ for line in "${buildlist[@]}"; do
CPUMIN CPUMAX UBOOT_VER KERNEL_VER GOVERNOR BOOTSIZE UBOOT_TOOLCHAIN KERNEL_TOOLCHAIN PACKAGE_LIST_EXCLUDE KERNEL_IMAGE_TYPE \
write_uboot_platform family_tweaks setup_write_uboot_platform BOOTSCRIPT UBOOT_TARGET_MAP LOCALVERSION UBOOT_COMPILER KERNEL_COMPILER \
MODULES MODULES_NEXT MODULES_DEV INITRD_ARCH HAS_UUID_SUPPORT BOOTENV_FILE BOOTDELAY MODULES_BLACKLIST MODULES_BLACKLIST_NEXT \
- MODULES_BLACKLIST_DEV MOUNT SDCARD BOOTPATCHDIR buildtext RELEASE UBOOT_ALT_GCC KERNEL_ALT_GCC
+ MODULES_BLACKLIST_DEV MOUNT SDCARD BOOTPATCHDIR buildtext RELEASE UBOOT_ALT_GCC KERNEL_ALT_GCC IMAGE_TYPE
read BOARD BRANCH RELEASE BUILD_DESKTOP <<< $line
n=$[$n+1]
View
@@ -26,14 +26,14 @@ DEST_LANG="en_US.UTF-8" # sl_SI.UTF-8, en_US.UTF-8
KERNEL_KEEP_CONFIG="no" # do not overwrite kernel config before compilation
EXTERNAL="yes" # build and install extra applications and drivers
EXTERNAL_NEW="prebuilt" # compile and install or install prebuilt additional packages
-CREATE_PATCHES="no" # wait that you make changes to uboot and kernel source and creates patches
+CREATE_PATCHES="no" # wait that you make changes to uboot and kernel source and creates patches
FORCE_CHECKOUT="yes" # ignore manual changes to source
BUILD_ALL="no" # cycle through available boards and make images or kernel/u-boot packages.
# set KERNEL_ONLY to "yes" or "no" to build all packages/all images
-BETA="" # set yes to add subrevision with tomorrow's date. For internal use.
-MULTITHREAD="" # build n images at once. For internal use.
-
+BETA="" # set yes to add subrevision with tomorrow's date. For internal use.
+MULTITHREAD="" # build n images at once. For internal use.
+
# build script version to use
LIB_TAG="" # empty for latest version,
# one of listed here: https://github.com/igorpecovnik/lib/tags for stable versions,
View
@@ -65,6 +65,12 @@ for i in "$@"; do
fi
done
+if [[ $BETA == yes ]]; then
+ IMAGE_TYPE=nightly
+else
+ IMAGE_TYPE=stable
+fi
+
if [[ $PROGRESS_DISPLAY == none ]]; then
OUTPUT_VERYSILENT=yes
elif [[ $PROGRESS_DISPLAY != plain ]]; then
View
@@ -125,6 +125,7 @@ create_board_package()
LINUXFAMILY=$LINUXFAMILY
BRANCH=$BRANCH
ARCH=$ARCHITECTURE
+ IMAGE_TYPE=$IMAGE_TYPE
EOF
# temper binary for USB temp meter
@@ -1,8 +1,16 @@
#!/bin/bash
# only do this for interactive shells
+
+. /etc/armbian-release
+
if [ "$-" != "${-#*i}" ]; then
if [ -f "$HOME/.not_logged_in_yet" ]; then
- echo -e "\n\e[0;31mThank you for choosing Armbian! Support: \e[1m\e[39mwww.armbian.com\x1B[0m\n"
+ if [[ $IMAGE_TYPE != nightly ]]; then
+ echo -e "\n\e[0;31mThank you for choosing Armbian! Support: \e[1m\e[39mwww.armbian.com\x1B[0m\n"
+ else
+ echo -e "\nYou are using Armbian nightly build."
+ echo -e "\nIt is provided \e[0;31mAS IS\x1B[0m with \e[0;31mNO WARRANTY\x1B[0m and \e[0;31mNO END USER SUPPORT\x1B[0m.\n"
+ fi
echo -e "Creating new account. Please provide a username (eg. your forename): \c"
read username
RealUserName="$(echo "${username}" | tr '[:upper:]' '[:lower:]' | tr -d -c '[:alnum:]')"
@@ -7,4 +7,4 @@ KERNELID=$(uname -r)
TERM=linux toilet -f standard -F metal $BOARD_NAME
-printf '\nWelcome to \e[0;91mARMBIAN\x1B[0m %s %s\n' "$PRETTY_NAME $KERNELID"
+printf '\nWelcome to \e[0;91mARMBIAN\x1B[0m %s %s %s %s\n' "$VERSION $IMAGE_TYPE $PRETTY_NAME $KERNELID"

2 comments on commit 612e134

@igorpecovnik
Owner

Shell we alter repository too?

@zador-blood-stained
Collaborator

Yes, I'll look into that later.

Please sign in to comment.