Add figlet and remove rock64 helpers

ayufan-rock64 · Jun 30, 2017 · 41bc5d5 · 41bc5d5
1 parent 9c6a1a5
commit 41bc5d5
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 56 deletions.
diff --git a/Makefile b/Makefile
@@ -27,6 +27,7 @@ linux-rock64-package-$(RELEASE_NAME).deb: package
 		-p $@ \
 		--deb-priority optional --category admin \
 		--force \
+		--depends figlet \
 		--deb-compression bzip2 \
 		--after-install package/scripts/postinst.deb \
 		--before-remove package/scripts/prerm.deb \

diff --git a/package/root/etc/update-motd.d/05-figlet b/package/root/etc/update-motd.d/05-figlet
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+figlet $(hostname)
diff --git a/package/root/etc/update-motd.d/11-rock64-help-text b/package/root/etc/update-motd.d/11-rock64-help-text
diff --git a/package/root/usr/local/sbin/rock64_update_package.sh b/package/root/usr/local/sbin/rock64_update_package.sh
diff --git a/rootfs/make_rootfs.sh b/rootfs/make_rootfs.sh
@@ -157,7 +157,7 @@ locale-gen en_US.UTF-8
 apt-get -y update
 apt-get -y install dosfstools curl xz-utils iw rfkill wpasupplicant openssh-server alsa-utils \
 	nano git build-essential vim jq wget ca-certificates software-properties-common dirmngr \
-	gdisk parted
+	gdisk parted figlet
 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys BF428671
 if [[ "$DISTRO" == "jessie" ]]; then
 	REPO=xenial
@@ -166,6 +166,9 @@ elif [[ "$DISTRO" == "stretch" ]]; then
 else
 	REPO="$DISTRO"
 fi
+if [[ "$DISTRO" == "xenial" || "$DISTRO" == "zesty" ]]; then
+	apt-get -y install landscape-common
+fi
 add-apt-repository "deb http://ppa.launchpad.net/ayufan/rock64-ppa/ubuntu \$REPO main"
 curl -fsSL http://deb.ayufan.eu/orgs/ayufan-rock64/archive.key | apt-key add -
 apt-get update -y