From 954e35ab475fa5de767d86a1334a06bde5345d40 Mon Sep 17 00:00:00 2001 From: zador-blood-stained Date: Mon, 24 Jul 2017 17:04:14 +0300 Subject: [PATCH] Clean up bin and scripts directories --- common.sh | 2 +- config/sources/s500.conf | 2 +- config/sources/sun50iw1.conf | 2 +- desktop.sh | 25 ++++++++---------- distributions.sh | 4 +-- .../desktop-splash/LICENSE.desktop-splash | 0 .../desktop-splash/desktop-splash.service | 2 +- .../blobs/desktop}/icons/jessie.png | Bin .../blobs/desktop}/icons/xenial.png | Bin .../skel}/.config/autostart/pasystray.desktop | 0 .../xfce4/desktop/icons.screen0-1904x1033.rc | 0 .../xfce4/desktop/icons.screen0-1904x1064.rc | 0 .../xfconf/xfce-perchannel-xml/thunar.xml | 0 .../xfce-perchannel-xml/xfce4-desktop.xml | 0 .../xfce4-keyboard-shortcuts.xml | 0 .../xfce-perchannel-xml/xfce4-notifyd.xml | 0 .../xfce-perchannel-xml/xfce4-panel.xml | 0 .../xfce4-power-manager.xml | 0 .../xfce-perchannel-xml/xfce4-session.xml | 0 .../xfconf/xfce-perchannel-xml/xfwm4.xml | 0 .../xfconf/xfce-perchannel-xml/xsettings.xml | 0 .../share/keyrings/Default_keyring.keyring | 0 .../skel}/.local/share/keyrings/default | 0 .../skel}/Desktop/Configuration.desktop | 0 .../desktop/skel}/Desktop/Support.desktop | 0 .../desktop/skel}/Desktop/paypal.desktop | 0 ...ncy-colors_2.4-trusty-Noobslab.com_all.deb | Bin .../desktop}/wallpapers/armbian01-old.jpg | Bin .../desktop}/wallpapers/armbian02-old.jpg | Bin .../armbian03-Dre0x-Minum-dark-3840x2160.jpg | Bin .../armbian04-chzbacon-Micro-SD.jpg | Bin .../armbian05-chzbacon-Linen-Dark.jpg | Bin .../armbian06-1430-very-dark-1280x1024.jpg | Bin .../armbian06-1430-very-dark-1440x1080.jpg | Bin .../armbian06-1430-very-dark-1650x1050.jpg | Bin .../armbian06-1430-very-dark-3840x2160.jpg | Bin .../armbian07-username-dark-3840x2160.jpg | Bin .../blobs}/splash/armbian-desktop.png | Bin .../blobs}/splash/armbian-u-boot.bmp | Bin .../blobs}/splash/armbian-universal.bmp | Bin {bin => packages/blobs}/splash/udoo.bmp | Bin .../50-pine64-pinebook-touchpad.conf | 0 42 files changed, 17 insertions(+), 20 deletions(-) rename {scripts => packages/blobs/desktop}/desktop-splash/LICENSE.desktop-splash (100%) rename {scripts => packages/blobs/desktop}/desktop-splash/desktop-splash.service (92%) rename {bin => packages/blobs/desktop}/icons/jessie.png (100%) rename {bin => packages/blobs/desktop}/icons/xenial.png (100%) rename {config/desktop => packages/blobs/desktop/skel}/.config/autostart/pasystray.desktop (100%) rename {config/desktop => packages/blobs/desktop/skel}/.config/xfce4/desktop/icons.screen0-1904x1033.rc (100%) rename {config/desktop => packages/blobs/desktop/skel}/.config/xfce4/desktop/icons.screen0-1904x1064.rc (100%) rename {config/desktop => packages/blobs/desktop/skel}/.config/xfce4/xfconf/xfce-perchannel-xml/thunar.xml (100%) rename {config/desktop => packages/blobs/desktop/skel}/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml (100%) rename {config/desktop => packages/blobs/desktop/skel}/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml (100%) rename {config/desktop => packages/blobs/desktop/skel}/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml (100%) rename {config/desktop => packages/blobs/desktop/skel}/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml (100%) rename {config/desktop => packages/blobs/desktop/skel}/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml (100%) rename {config/desktop => packages/blobs/desktop/skel}/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml (100%) rename {config/desktop => packages/blobs/desktop/skel}/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml (100%) rename {config/desktop => packages/blobs/desktop/skel}/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml (100%) rename {config/desktop => packages/blobs/desktop/skel}/.local/share/keyrings/Default_keyring.keyring (100%) rename {config/desktop => packages/blobs/desktop/skel}/.local/share/keyrings/default (100%) rename {config/desktop => packages/blobs/desktop/skel}/Desktop/Configuration.desktop (100%) mode change 100755 => 100644 rename {config/desktop => packages/blobs/desktop/skel}/Desktop/Support.desktop (100%) mode change 100755 => 100644 rename {config/desktop => packages/blobs/desktop/skel}/Desktop/paypal.desktop (100%) mode change 100755 => 100644 rename {bin => packages/blobs/desktop}/vibrancy-colors_2.4-trusty-Noobslab.com_all.deb (100%) rename {bin => packages/blobs/desktop}/wallpapers/armbian01-old.jpg (100%) rename {bin => packages/blobs/desktop}/wallpapers/armbian02-old.jpg (100%) rename {bin => packages/blobs/desktop}/wallpapers/armbian03-Dre0x-Minum-dark-3840x2160.jpg (100%) rename {bin => packages/blobs/desktop}/wallpapers/armbian04-chzbacon-Micro-SD.jpg (100%) rename {bin => packages/blobs/desktop}/wallpapers/armbian05-chzbacon-Linen-Dark.jpg (100%) rename {bin => packages/blobs/desktop}/wallpapers/armbian06-1430-very-dark-1280x1024.jpg (100%) rename {bin => packages/blobs/desktop}/wallpapers/armbian06-1430-very-dark-1440x1080.jpg (100%) rename {bin => packages/blobs/desktop}/wallpapers/armbian06-1430-very-dark-1650x1050.jpg (100%) rename {bin => packages/blobs/desktop}/wallpapers/armbian06-1430-very-dark-3840x2160.jpg (100%) rename {bin => packages/blobs/desktop}/wallpapers/armbian07-username-dark-3840x2160.jpg (100%) rename {bin => packages/blobs}/splash/armbian-desktop.png (100%) rename {bin => packages/blobs}/splash/armbian-u-boot.bmp (100%) rename {bin => packages/blobs}/splash/armbian-universal.bmp (100%) rename {bin => packages/blobs}/splash/udoo.bmp (100%) rename {config => packages/bsp/pinebook}/50-pine64-pinebook-touchpad.conf (100%) diff --git a/common.sh b/common.sh index f2cf1984b1..dc808b85ac 100644 --- a/common.sh +++ b/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 diff --git a/config/sources/s500.conf b/config/sources/s500.conf index dd1325b36d..d61208e654 100644 --- a/config/sources/s500.conf +++ b/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 } diff --git a/config/sources/sun50iw1.conf b/config/sources/sun50iw1.conf index 897823eee1..0621712013 100644 --- a/config/sources/sun50iw1.conf +++ b/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 } diff --git a/desktop.sh b/desktop.sh index 0169a63c1e..276a2ce1ff 100644 --- a/desktop.sh +++ b/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 } diff --git a/distributions.sh b/distributions.sh index c11e5d57a1..1bbee4bf35 100644 --- a/distributions.sh +++ b/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 diff --git a/scripts/desktop-splash/LICENSE.desktop-splash b/packages/blobs/desktop/desktop-splash/LICENSE.desktop-splash similarity index 100% rename from scripts/desktop-splash/LICENSE.desktop-splash rename to packages/blobs/desktop/desktop-splash/LICENSE.desktop-splash diff --git a/scripts/desktop-splash/desktop-splash.service b/packages/blobs/desktop/desktop-splash/desktop-splash.service similarity index 92% rename from scripts/desktop-splash/desktop-splash.service rename to packages/blobs/desktop/desktop-splash/desktop-splash.service index acbdd3912c..4af222bef5 100644 --- a/scripts/desktop-splash/desktop-splash.service +++ b/packages/blobs/desktop/desktop-splash/desktop-splash.service @@ -10,4 +10,4 @@ ExecStart=/usr/bin/fbi -vt 1 -noverbose -d /dev/fb0 /boot/boot-desktop.png RemainAfterExit=yes [Install] -WantedBy=sysinit.target \ No newline at end of file +WantedBy=sysinit.target diff --git a/bin/icons/jessie.png b/packages/blobs/desktop/icons/jessie.png similarity index 100% rename from bin/icons/jessie.png rename to packages/blobs/desktop/icons/jessie.png diff --git a/bin/icons/xenial.png b/packages/blobs/desktop/icons/xenial.png similarity index 100% rename from bin/icons/xenial.png rename to packages/blobs/desktop/icons/xenial.png diff --git a/config/desktop/.config/autostart/pasystray.desktop b/packages/blobs/desktop/skel/.config/autostart/pasystray.desktop similarity index 100% rename from config/desktop/.config/autostart/pasystray.desktop rename to packages/blobs/desktop/skel/.config/autostart/pasystray.desktop diff --git a/config/desktop/.config/xfce4/desktop/icons.screen0-1904x1033.rc b/packages/blobs/desktop/skel/.config/xfce4/desktop/icons.screen0-1904x1033.rc similarity index 100% rename from config/desktop/.config/xfce4/desktop/icons.screen0-1904x1033.rc rename to packages/blobs/desktop/skel/.config/xfce4/desktop/icons.screen0-1904x1033.rc diff --git a/config/desktop/.config/xfce4/desktop/icons.screen0-1904x1064.rc b/packages/blobs/desktop/skel/.config/xfce4/desktop/icons.screen0-1904x1064.rc similarity index 100% rename from config/desktop/.config/xfce4/desktop/icons.screen0-1904x1064.rc rename to packages/blobs/desktop/skel/.config/xfce4/desktop/icons.screen0-1904x1064.rc diff --git a/config/desktop/.config/xfce4/xfconf/xfce-perchannel-xml/thunar.xml b/packages/blobs/desktop/skel/.config/xfce4/xfconf/xfce-perchannel-xml/thunar.xml similarity index 100% rename from config/desktop/.config/xfce4/xfconf/xfce-perchannel-xml/thunar.xml rename to packages/blobs/desktop/skel/.config/xfce4/xfconf/xfce-perchannel-xml/thunar.xml diff --git a/config/desktop/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml b/packages/blobs/desktop/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml similarity index 100% rename from config/desktop/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml rename to packages/blobs/desktop/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml diff --git a/config/desktop/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml b/packages/blobs/desktop/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml similarity index 100% rename from config/desktop/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml rename to packages/blobs/desktop/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml diff --git a/config/desktop/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml b/packages/blobs/desktop/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml similarity index 100% rename from config/desktop/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml rename to packages/blobs/desktop/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml diff --git a/config/desktop/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml b/packages/blobs/desktop/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml similarity index 100% rename from config/desktop/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml rename to packages/blobs/desktop/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml diff --git a/config/desktop/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml b/packages/blobs/desktop/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml similarity index 100% rename from config/desktop/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml rename to packages/blobs/desktop/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml diff --git a/config/desktop/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml b/packages/blobs/desktop/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml similarity index 100% rename from config/desktop/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml rename to packages/blobs/desktop/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml diff --git a/config/desktop/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml b/packages/blobs/desktop/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml similarity index 100% rename from config/desktop/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml rename to packages/blobs/desktop/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml diff --git a/config/desktop/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml b/packages/blobs/desktop/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml similarity index 100% rename from config/desktop/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml rename to packages/blobs/desktop/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml diff --git a/config/desktop/.local/share/keyrings/Default_keyring.keyring b/packages/blobs/desktop/skel/.local/share/keyrings/Default_keyring.keyring similarity index 100% rename from config/desktop/.local/share/keyrings/Default_keyring.keyring rename to packages/blobs/desktop/skel/.local/share/keyrings/Default_keyring.keyring diff --git a/config/desktop/.local/share/keyrings/default b/packages/blobs/desktop/skel/.local/share/keyrings/default similarity index 100% rename from config/desktop/.local/share/keyrings/default rename to packages/blobs/desktop/skel/.local/share/keyrings/default diff --git a/config/desktop/Desktop/Configuration.desktop b/packages/blobs/desktop/skel/Desktop/Configuration.desktop old mode 100755 new mode 100644 similarity index 100% rename from config/desktop/Desktop/Configuration.desktop rename to packages/blobs/desktop/skel/Desktop/Configuration.desktop diff --git a/config/desktop/Desktop/Support.desktop b/packages/blobs/desktop/skel/Desktop/Support.desktop old mode 100755 new mode 100644 similarity index 100% rename from config/desktop/Desktop/Support.desktop rename to packages/blobs/desktop/skel/Desktop/Support.desktop diff --git a/config/desktop/Desktop/paypal.desktop b/packages/blobs/desktop/skel/Desktop/paypal.desktop old mode 100755 new mode 100644 similarity index 100% rename from config/desktop/Desktop/paypal.desktop rename to packages/blobs/desktop/skel/Desktop/paypal.desktop diff --git a/bin/vibrancy-colors_2.4-trusty-Noobslab.com_all.deb b/packages/blobs/desktop/vibrancy-colors_2.4-trusty-Noobslab.com_all.deb similarity index 100% rename from bin/vibrancy-colors_2.4-trusty-Noobslab.com_all.deb rename to packages/blobs/desktop/vibrancy-colors_2.4-trusty-Noobslab.com_all.deb diff --git a/bin/wallpapers/armbian01-old.jpg b/packages/blobs/desktop/wallpapers/armbian01-old.jpg similarity index 100% rename from bin/wallpapers/armbian01-old.jpg rename to packages/blobs/desktop/wallpapers/armbian01-old.jpg diff --git a/bin/wallpapers/armbian02-old.jpg b/packages/blobs/desktop/wallpapers/armbian02-old.jpg similarity index 100% rename from bin/wallpapers/armbian02-old.jpg rename to packages/blobs/desktop/wallpapers/armbian02-old.jpg diff --git a/bin/wallpapers/armbian03-Dre0x-Minum-dark-3840x2160.jpg b/packages/blobs/desktop/wallpapers/armbian03-Dre0x-Minum-dark-3840x2160.jpg similarity index 100% rename from bin/wallpapers/armbian03-Dre0x-Minum-dark-3840x2160.jpg rename to packages/blobs/desktop/wallpapers/armbian03-Dre0x-Minum-dark-3840x2160.jpg diff --git a/bin/wallpapers/armbian04-chzbacon-Micro-SD.jpg b/packages/blobs/desktop/wallpapers/armbian04-chzbacon-Micro-SD.jpg similarity index 100% rename from bin/wallpapers/armbian04-chzbacon-Micro-SD.jpg rename to packages/blobs/desktop/wallpapers/armbian04-chzbacon-Micro-SD.jpg diff --git a/bin/wallpapers/armbian05-chzbacon-Linen-Dark.jpg b/packages/blobs/desktop/wallpapers/armbian05-chzbacon-Linen-Dark.jpg similarity index 100% rename from bin/wallpapers/armbian05-chzbacon-Linen-Dark.jpg rename to packages/blobs/desktop/wallpapers/armbian05-chzbacon-Linen-Dark.jpg diff --git a/bin/wallpapers/armbian06-1430-very-dark-1280x1024.jpg b/packages/blobs/desktop/wallpapers/armbian06-1430-very-dark-1280x1024.jpg similarity index 100% rename from bin/wallpapers/armbian06-1430-very-dark-1280x1024.jpg rename to packages/blobs/desktop/wallpapers/armbian06-1430-very-dark-1280x1024.jpg diff --git a/bin/wallpapers/armbian06-1430-very-dark-1440x1080.jpg b/packages/blobs/desktop/wallpapers/armbian06-1430-very-dark-1440x1080.jpg similarity index 100% rename from bin/wallpapers/armbian06-1430-very-dark-1440x1080.jpg rename to packages/blobs/desktop/wallpapers/armbian06-1430-very-dark-1440x1080.jpg diff --git a/bin/wallpapers/armbian06-1430-very-dark-1650x1050.jpg b/packages/blobs/desktop/wallpapers/armbian06-1430-very-dark-1650x1050.jpg similarity index 100% rename from bin/wallpapers/armbian06-1430-very-dark-1650x1050.jpg rename to packages/blobs/desktop/wallpapers/armbian06-1430-very-dark-1650x1050.jpg diff --git a/bin/wallpapers/armbian06-1430-very-dark-3840x2160.jpg b/packages/blobs/desktop/wallpapers/armbian06-1430-very-dark-3840x2160.jpg similarity index 100% rename from bin/wallpapers/armbian06-1430-very-dark-3840x2160.jpg rename to packages/blobs/desktop/wallpapers/armbian06-1430-very-dark-3840x2160.jpg diff --git a/bin/wallpapers/armbian07-username-dark-3840x2160.jpg b/packages/blobs/desktop/wallpapers/armbian07-username-dark-3840x2160.jpg similarity index 100% rename from bin/wallpapers/armbian07-username-dark-3840x2160.jpg rename to packages/blobs/desktop/wallpapers/armbian07-username-dark-3840x2160.jpg diff --git a/bin/splash/armbian-desktop.png b/packages/blobs/splash/armbian-desktop.png similarity index 100% rename from bin/splash/armbian-desktop.png rename to packages/blobs/splash/armbian-desktop.png diff --git a/bin/splash/armbian-u-boot.bmp b/packages/blobs/splash/armbian-u-boot.bmp similarity index 100% rename from bin/splash/armbian-u-boot.bmp rename to packages/blobs/splash/armbian-u-boot.bmp diff --git a/bin/splash/armbian-universal.bmp b/packages/blobs/splash/armbian-universal.bmp similarity index 100% rename from bin/splash/armbian-universal.bmp rename to packages/blobs/splash/armbian-universal.bmp diff --git a/bin/splash/udoo.bmp b/packages/blobs/splash/udoo.bmp similarity index 100% rename from bin/splash/udoo.bmp rename to packages/blobs/splash/udoo.bmp diff --git a/config/50-pine64-pinebook-touchpad.conf b/packages/bsp/pinebook/50-pine64-pinebook-touchpad.conf similarity index 100% rename from config/50-pine64-pinebook-touchpad.conf rename to packages/bsp/pinebook/50-pine64-pinebook-touchpad.conf