Clean up bin and scripts directories

common.sh

@@ -81,7 +81,7 @@ compile_uboot()
 
 		[[ -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 tools/logos/udoo.bmp ]] && cp $SRC/lib/bin/splash/udoo.bmp tools/logos/udoo.bmp
+		[[ -f tools/logos/udoo.bmp ]] && cp $SRC/lib/packages/blobs/splash/udoo.bmp tools/logos/udoo.bmp
 		touch .scmversion
 
 		# $BOOTDELAY can be set in board family config, ensure autoboot can be stopped even if set to 0

config/sources/s500.conf

@@ -39,5 +39,5 @@ family_tweaks()
 {
 	printf "blacklist wlan_8723bs_vq0\nblacklist ctp_gslX680\nblacklist ctp_gsl3680\n" > $CACHEDIR/$SDCARD/etc/modprobe.d/blacklist-guitar.conf
 	printf "blacklist gsensor_mir3da\nblacklist gsensor_stk8313\nblacklist gsensor_bma222\nblacklist lightsensor_ltr301\n" >> $CACHEDIR/$SDCARD/etc/modprobe.d/blacklist-guitar.conf
-	gzip < $SRC/lib/bin/splash/udoo.bmp > $CACHEDIR/$SDCARD/boot/boot_logo.bmp.gz
+	gzip < $SRC/lib/packages/blobs/splash/udoo.bmp > $CACHEDIR/$SDCARD/boot/boot_logo.bmp.gz
 }

config/sources/sun50iw1.conf

@@ -64,7 +64,6 @@ family_tweaks()
 			# enable services installed from BSP
 			chroot $CACHEDIR/$SDCARD /bin/bash -c "systemctl --no-reload enable pinebook-bluetooth.service pinebook-enable-sound.service \
 				pinebook-store-sound-on-suspend.service pinebook-restore-sound-after-resume.service >/dev/null 2>&1"
-			cp $SRC/lib/config/50-pine64-pinebook-touchpad.conf $CACHEDIR/$SDCARD/etc/X11/xorg.conf.d/50-pine64-pinebook-touchpad.conf
 		fi
 		# power manager
 		[[ $BUILD_DESKTOP == yes && $BOARD == pinebook-a64 ]] && chroot $CACHEDIR/$SDCARD /bin/bash -c "apt-get -qq -y install xfce4-power-manager >/dev/null 2>&1"
@@ -85,5 +84,6 @@ family_tweaks_bsp()
 		# suspend resume audio fix for Pinebook
 		cp $SRC/lib/packages/bsp/pinebook/pinebook-store-sound-on-suspend.service $destination/lib/systemd/system/
 		cp $SRC/lib/packages/bsp/pinebook/pinebook-restore-sound-after-resume.service $destination/lib/systemd/system/
+		cp $SRC/lib/packages/bsp/pinebook/50-pine64-pinebook-touchpad.conf $destination/etc/X11/xorg.conf.d/50-pine64-pinebook-touchpad.conf
 	fi
 }

desktop.sh

@@ -13,11 +13,8 @@ install_desktop ()
 {
 	display_alert "Installing desktop" "XFCE" "info"
 
-	mkdir -p $CACHEDIR/$SDCARD/tmp/bin
-	mount --bind $SRC/lib/bin/ $CACHEDIR/$SDCARD/tmp/bin
-
 	# add loading desktop splash service
-	cp $SRC/lib/scripts/desktop-splash/desktop-splash.service $CACHEDIR/$SDCARD/etc/systemd/system/desktop-splash.service
+	cp $SRC/lib/packages/blobs/desktop/desktop-splash/desktop-splash.service $CACHEDIR/$SDCARD/etc/systemd/system/desktop-splash.service
 
 	if [[ $RELEASE == xenial ]]; then
 		# install optimized firefox configuration
@@ -26,21 +23,23 @@ install_desktop ()
 		cp $SRC/lib/config/chromium.conf $CACHEDIR/$SDCARD/etc/chromium-browser/default
 	fi
 	# install dedicated startup icons
-	cp $SRC/lib/bin/icons/${RELEASE}.png $CACHEDIR/$SDCARD/usr/share/pixmaps
+	cp $SRC/lib/packages/blobs/desktop/icons/${RELEASE}.png $CACHEDIR/$SDCARD/usr/share/pixmaps
 
 	# install default desktop settings
-	cp -R $SRC/lib/config/desktop/. $CACHEDIR/$SDCARD/etc/skel
-	cp -R $SRC/lib/config/desktop/. $CACHEDIR/$SDCARD/root
+	cp -R $SRC/lib/packages/blobs/desktop/skel/. $CACHEDIR/$SDCARD/etc/skel
+	cp -R $SRC/lib/packages/blobs/desktop/skel/. $CACHEDIR/$SDCARD/root
 
 	# install wallpapers
-	d=$CACHEDIR/$SDCARD/usr/share/backgrounds/xfce/
-	test -d "$d" || mkdir -p "$d" && cp $SRC/lib/bin/wallpapers/armbian*.jpg "$d"
+	mkdir -p $CACHEDIR/$SDCARD/usr/share/backgrounds/xfce/
+	cp $SRC/lib/packages/blobs/desktop/wallpapers/armbian*.jpg $CACHEDIR/$SDCARD/usr/share/backgrounds/xfce/
 
 	# Install custom icons and theme
-	chroot $CACHEDIR/$SDCARD /bin/bash -c "dpkg -i /tmp/bin/vibrancy-colors_2.4-trusty-Noobslab.com_all.deb >/dev/null 2>&1"
+	cp $SRC/lib/packages/blobs/desktop/vibrancy-colors_2.4-trusty-Noobslab.com_all.deb $CACHEDIR/$SDCARD/tmp/
+	chroot $CACHEDIR/$SDCARD /bin/bash -c "dpkg -i /tmp/vibrancy-colors_2.4-trusty-Noobslab.com_all.deb >/dev/null 2>&1"
+	rm -f $CACHEDIR/$SDCARD/tmp/*.deb
 
 	# Enable network manager
-	if [[ -f ${CACHEDIR}/$SDCARD/etc/NetworkManager/NetworkManager.conf ]]; then
+	if [[ -f $CACHEDIR/$SDCARD/etc/NetworkManager/NetworkManager.conf ]]; then
 		sed "s/managed=\(.*\)/managed=true/g" -i $CACHEDIR/$SDCARD/etc/NetworkManager/NetworkManager.conf
 		# Disable dns management withing NM
 		sed "s/\[main\]/\[main\]\ndns=none/g" -i $CACHEDIR/$SDCARD/etc/NetworkManager/NetworkManager.conf
@@ -48,7 +47,7 @@ install_desktop ()
 	fi
 
 	# Disable Pulseaudio timer scheduling which does not work with sndhdmi driver
-	if [[ -f ${CACHEDIR}/$SDCARD/etc/pulse/default.pa ]]; then
+	if [[ -f $CACHEDIR/$SDCARD/etc/pulse/default.pa ]]; then
 		sed "s/load-module module-udev-detect$/& tsched=0/g" -i  $CACHEDIR/$SDCARD/etc/pulse/default.pa
 	fi
 
@@ -63,6 +62,4 @@ install_desktop ()
 		# enable memory reservations
 		echo "disp_mem_reserves=on" >> $CACHEDIR/$SDCARD/boot/armbianEnv.txt
 	fi
-
-	umount $CACHEDIR/$SDCARD/tmp/bin && rm -rf $CACHEDIR/$SDCARD/tmp/bin
 }

distributions.sh

@@ -134,8 +134,8 @@ install_common()
 	fi
 
 	# copy boot splash images
-	cp $SRC/lib/bin/splash/armbian-u-boot.bmp $CACHEDIR/$SDCARD/boot/boot.bmp
-	cp $SRC/lib/bin/splash/armbian-desktop.png $CACHEDIR/$SDCARD/boot/boot-desktop.png
+	cp $SRC/lib/packages/blobs/splash/armbian-u-boot.bmp $CACHEDIR/$SDCARD/boot/boot.bmp
+	cp $SRC/lib/packages/blobs/splash/armbian-desktop.png $CACHEDIR/$SDCARD/boot/boot-desktop.png
 
 	# execute $LINUXFAMILY-specific tweaks
 	[[ $(type -t family_tweaks) == function ]] && family_tweaks