kreyren/OSHW-DEIMOS
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge pull request #38 from leon-anavi/kde

Browse Source 
Supplementary Ubuntu 18.04.2 images with GUI (kde or dwm) and a switch to ppa:ayufan/pine64-ppa
This commit is contained in:
TsvetanUsunov 2020-07-14 13:53:17 +03:00 committed by GitHub
commit a7f37361e0
Signed by: GitHub
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
SOFTWARE/A64-TERES/scripts/make_rootfs.sh
View File

@ -77,7 +77,7 @@ case $DISTRO in
xenial) xenial)
ROOTFS="http://cdimage.ubuntu.com/ubuntu-base/releases/16.04.2/release/ubuntu-base-16.04.2-base-arm64.tar.gz" ROOTFS="http://cdimage.ubuntu.com/ubuntu-base/releases/16.04.2/release/ubuntu-base-16.04.2-base-arm64.tar.gz"
;; ;;
bionic) bionic|kde|geek)
ROOTFS="http://cdimage.ubuntu.com/ubuntu-base/releases/18.04.2/release/ubuntu-base-18.04-base-arm64.tar.gz" ROOTFS="http://cdimage.ubuntu.com/ubuntu-base/releases/18.04.2/release/ubuntu-base-18.04-base-arm64.tar.gz"
;; ;;
sid|jessie) sid|jessie)
@ -238,6 +238,10 @@ EOF
add_ubuntu_apt_sources() { add_ubuntu_apt_sources() {
local release="$1" local release="$1"
# Use Ubuntu 18.04 bionic repositories for KDE image
if [ "$release" = "kde" -o "$release" = "geek" ]; then
release="bionic"
fi
cat > "$DEST/etc/apt/sources.list" <<EOF cat > "$DEST/etc/apt/sources.list" <<EOF
deb http://ports.ubuntu.com/ ${release} main restricted universe multiverse deb http://ports.ubuntu.com/ ${release} main restricted universe multiverse
deb-src http://ports.ubuntu.com/ ${release} main restricted universe multiverse deb-src http://ports.ubuntu.com/ ${release} main restricted universe multiverse
@ -285,16 +289,16 @@ EOF
rm -f "$DEST/etc/resolv.conf" rm -f "$DEST/etc/resolv.conf"
mv "$DEST/etc/resolv.conf.dist" "$DEST/etc/resolv.conf" mv "$DEST/etc/resolv.conf.dist" "$DEST/etc/resolv.conf"
;; ;;
xenial|bionic|sid|jessie) xenial|bionic|sid|jessie|kde|geek)
rm "$DEST/etc/resolv.conf" rm "$DEST/etc/resolv.conf"
cp /etc/resolv.conf "$DEST/etc/resolv.conf" cp /etc/resolv.conf "$DEST/etc/resolv.conf"
if [ "$DISTRO" = "xenial" -o "$DISTRO" = "bionic" ]; then if [ "$DISTRO" = "xenial" -o "$DISTRO" = "bionic" -o "$DISTRO" = "kde" -o "$DISTRO" = "geek" ]; then
DEB=ubuntu DEB=ubuntu
DEBUSER=olimex DEBUSER=olimex
DEBUSERPW=olimex DEBUSERPW=olimex
ADDPPACMD="apt-get -y update && \ ADDPPACMD="apt-get -y update && \
apt-get install -y software-properties-common && \ apt-get install -y software-properties-common && \
apt-add-repository -y ppa:longsleep/ubuntu-pine64-flavour-makers \ apt-add-repository -y ppa:ayufan/pine64-ppa \
" "
EXTRADEBS="\ EXTRADEBS="\
zram-config \ zram-config \
@ -307,6 +311,20 @@ EOF
rsync \ rsync \
blueman \ blueman \
" "
if [ "$DISTRO" = "kde" ]; then
# Additional KDE packages
EXTRADEBS+=" kde-plasma-desktop "
elif [ "$DISTRO" = "geek" ]; then
# Packages for a geek look & feel :)
EXTRADEBS+="\
xorg \
xdm \
dwm \
surf \
stterm \
vim \
"
fi
elif [ "$DISTRO" = "sid" -o "$DISTRO" = "jessie" ]; then elif [ "$DISTRO" = "sid" -o "$DISTRO" = "jessie" ]; then
DEB=debian DEB=debian
DEBUSER=olimex DEBUSER=olimex