From 57c74fedbf89381ee1a726c67b52540c48bc5fb4 Mon Sep 17 00:00:00 2001 From: zador-blood-stained Date: Wed, 5 Oct 2016 19:33:12 +0300 Subject: [PATCH] Small improvements --- common.sh | 2 +- configuration.sh | 4 ++-- debootstrap-ng.sh | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/common.sh b/common.sh index cfb849a845..a0f366f00e 100644 --- a/common.sh +++ b/common.sh @@ -89,7 +89,7 @@ compile_uboot() Priority: optional Provides: armbian-u-boot Replaces: armbian-u-boot - Conflicts: armbian-u-boot + Conflicts: armbian-u-boot, u-boot-sunxi Description: Uboot loader $version END diff --git a/configuration.sh b/configuration.sh index 0d63e73380..6002c66a47 100644 --- a/configuration.sh +++ b/configuration.sh @@ -99,10 +99,10 @@ PACKAGE_LIST_ADDITIONAL="alsa-utils btrfs-tools hddtemp iotop iozone3 stress sys apt-transport-https libfuse2 libdigest-sha-perl libproc-processtable-perl w-scan aptitude dnsutils f3 haveged hdparm rfkill \ vlan sysstat bluez bluez-tools bash-completion hostapd git" -PACKAGE_LIST_DESKTOP="xserver-xorg xserver-xorg-video-fbdev gvfs-backends gvfs-fuse xfonts-base xinit nodm x11-xserver-utils xfce4 lxtask xterm mirage radiotray thunar-volman galculator \ +PACKAGE_LIST_DESKTOP="xserver-xorg xserver-xorg-video-fbdev gvfs-backends gvfs-fuse xfonts-base xinit nodm x11-xserver-utils xfce4 lxtask xterm mirage thunar-volman galculator \ gtk2-engines gtk2-engines-murrine gtk2-engines-pixbuf libgtk2.0-bin gcj-jre-headless xfce4-screenshooter libgnome2-perl gksu bluetooth \ network-manager network-manager-gnome xfce4-notifyd gnome-keyring gcr libgck-1-0 libgcr-3-common p11-kit pasystray pavucontrol pulseaudio \ - paman pavumeter pulseaudio-module-gconf pulseaudio-module-zeroconf pulseaudio-module-bluetooth blueman libpam-gnome-keyring libgl1-mesa-dri" + paman pavumeter pulseaudio-module-gconf pulseaudio-module-bluetooth blueman libpam-gnome-keyring libgl1-mesa-dri mpv" PACKAGE_LIST_EXCLUDE="xfce4-mixer" diff --git a/debootstrap-ng.sh b/debootstrap-ng.sh index 8492a48b0f..ce8a389211 100644 --- a/debootstrap-ng.sh +++ b/debootstrap-ng.sh @@ -23,7 +23,7 @@ # debootstrap_ng() { - display_alert "Starting build process for" "$BOARD $RELEASE" "info" + display_alert "Starting rootfs and image building process for" "$BOARD $RELEASE" "info" [[ "ext4 f2fs btrfs nfs fel" != *$ROOTFS_TYPE* ]] && exit_with_error "Unknown rootfs type" "$ROOTFS_TYPE"