Skip to content

Commit aac8394

Browse files
the-snowwhitethe-snowwhite
committed
Make buster image smaller, add BOOT.BIN v1 and v2 for both U96 revisions
Signed-off-by: Michael Brown <producer@holotronic.dk>
1 parent ac7b2b1 commit aac8394

File tree

2 files changed

+12
-14
lines changed

2 files changed

+12
-14
lines changed

‎SD-Image-Gen/build-all.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ UBOOT_MAKE_CONFIG="all"
7676
UBOOT_IMG_FILENAME="u-boot-with-spl.sfp"
7777
XIL_UBOOT_IMG_FILENAME="u-boot"
7878
#XIL_BOOT_FILES_LOC="/home/mib/Development/Docker/petalinux-docker"
79-
XIL_BOOT_FILES_LOC='/home/mib/Projects/2019v1/my-work'
79+
XIL_BOOT_FILES_LOC='/home/mib/Projects/sd-boot-files'
8080
RT_KERNEL_VERSION="4.9.68"
8181
RT_PATCH_REV="rt60"
8282

@@ -588,7 +588,7 @@ assemble_full_sd_img() {
588588
sudo cp ${XIL_BOOT_FILES_LOC}/peta_built/images/linux/BOOT.BIN ${1}
589589
sudo cp ${XIL_BOOT_FILES_LOC}/peta_built/images/linux/image.ub ${1}
590590
else
591-
sudo cp ${XIL_BOOT_FILES_LOC}/BOOT.BIN ${1}
591+
sudo cp ${XIL_BOOT_FILES_LOC}/BOOT.BIN* ${1}
592592
sudo cp ${XIL_BOOT_FILES_LOC}/image.ub ${1}
593593
fi
594594
echo "MSG: Unmounting boot partition"

‎SD-Image-Gen/functions/rootfs-func.sh‎

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -963,10 +963,7 @@ sudo chroot --userspec=root:root ${1} /bin/mkdir -p /var/tmp
963963
sudo chroot --userspec=root:root ${1} /bin/chmod 1777 /var/tmp
964964
sudo sh -c 'LANG=C.UTF-8 chroot --userspec=root:root '${1}' /usr/bin/'${apt_cmd}' -y update'
965965
sudo sh -c 'LANG=C.UTF-8 chroot --userspec=root:root '${1}' /usr/bin/'${apt_cmd}' -y --assume-yes upgrade'
966-
#if [ "${3}" == "buster" ]; then
967-
sudo sh -c 'LANG=C.UTF-8 chroot --userspec=root:root '${1}' /usr/bin/'${apt_cmd}' -y install debconf gnupg2 sudo wget apt-utils kmod'
968-
#fi
969-
#if [ "${3}" == "bionic" ]; then
966+
sudo sh -c 'LANG=C.UTF-8 chroot --userspec=root:root '${1}' /usr/bin/'${apt_cmd}' -y install debconf gnupg2 sudo wget apt-utils kmod'
970967

971968
#export DEBIAN_FRONTEND=noninteractive
972969
#apt-get install -y tzdata
@@ -976,7 +973,7 @@ sudo sh -c 'LANG=C.UTF-8 chroot --userspec=root:root '${1}' /usr/bin/'${apt_cmd}
976973
sudo sh -c 'DEBIAN_FRONTEND=noninteractive LANG=C.UTF-8 chroot --userspec=root:root '${1}' /usr/bin/'${apt_cmd}' -y install tzdata'
977974
sudo sh -c 'DEBIAN_FRONTEND=noninteractive LANG=C.UTF-8 chroot --userspec=root:root '${1}' /bin/ln -fs /usr/share/zoneinfo/Europe/Copenhagen /etc/localtime'
978975
sudo sh -c 'DEBIAN_FRONTEND=noninteractive LANG=C.UTF-8 chroot --userspec=root:root '${1}' /usr/sbin/dpkg-reconfigure --frontend noninteractive tzdata'
979-
sudo sh -c 'LANG=C.UTF-8 chroot --userspec=root:root '${1}' /usr/bin/'${apt_cmd}' -y install kwrite gnupg2 avahi-discover traceroute cgroupfs-mount ntp'
976+
sudo sh -c 'LANG=C.UTF-8 chroot --userspec=root:root '${1}' /usr/bin/'${apt_cmd}' -y install featherpad gnupg2 avahi-discover traceroute cgroupfs-mount ntp'
980977
#fi
981978
if [ "${3}" == "bionic" ]; then
982979
sudo chroot --userspec=root:root ${1} /usr/bin/wget http://${local_ws}.holotronic.lan/ubuntu/socfpgakernel.gpg.key
@@ -1022,16 +1019,16 @@ if [ "${DESKTOP}" == "yes" ]; then
10221019
sudo sh -c 'LANG=C.UTF-8 chroot --userspec=root:root '${1}' /usr/bin/'${apt_cmd}' -y install sddm'
10231020
else
10241021
sudo sh -c 'LANG=C.UTF-8 chroot --userspec=root:root '${1}' /usr/bin/'${apt_cmd}' -y install software-properties-common'
1025-
sudo sh -c 'LANG=C.UTF-8 chroot --userspec=root:root '${1}' /usr/bin/'${apt_cmd}' -y install lxqt-core openbox lxqt-sudo'
1022+
sudo sh -c 'LANG=C.UTF-8 chroot --userspec=root:root '${1}' /usr/bin/'${apt_cmd}' -y install lxqt-core lxqt-sudo'
10261023
sudo sh -c 'LANG=C.UTF-8 chroot --userspec=root:root '${1}' /usr/bin/'${apt_cmd}' -y install lxqt pcmanfm-qt5'
10271024
sudo sh -c 'LANG=C.UTF-8 chroot --userspec=root:root '${1}' /usr/bin/'${apt_cmd}' -y install lxmenu-data lxqt-globalkeys lxqt-panel lxqt'
1028-
sudo sh -c 'LANG=C.UTF-8 chroot --userspec=root:root '${1}' /usr/bin/'${apt_cmd}' -y install sddm sddm-theme-breeze'
1025+
# sudo sh -c 'LANG=C.UTF-8 chroot --userspec=root:root '${1}' /usr/bin/'${apt_cmd}' -y install sddm sddm-theme-breeze'
10291026
sudo sh -c 'LANG=C.UTF-8 chroot --userspec=root:root '${1}' /usr/bin/'${apt_cmd}' -y install breeze breeze-cursor-theme breeze-icon-theme'
10301027
# sudo sh -c 'LANG=C.UTF-8 chroot --userspec=root:root '${1}' /usr/bin/'${apt_cmd}' -y install tasksel'
10311028
# sudo sh -c 'LANG=C.UTF-8 chroot --userspec=root:root '${1}' /usr/bin/'${apt_cmd}' -y install task-lxqt-desktop'
10321029
fi
1033-
sudo sh -c 'LANG=C.UTF-8 chroot --userspec=root:root '${1}' /usr/bin/'${apt_cmd}' -y install mesa-utils mesa-utils-extra'
1034-
sudo sh -c 'LANG=C.UTF-8 chroot --userspec=root:root '${1}' /usr/bin/'${apt_cmd}' -y install xfonts-base xfonts-cyrillic xfonts-100dpi xfonts-75dpi'
1030+
sudo sh -c 'LANG=C.UTF-8 chroot --userspec=root:root '${1}' /usr/bin/'${apt_cmd}' -y install mesa-utils mesa-utils-extra xfonts-cyrillic'
1031+
# sudo sh -c 'LANG=C.UTF-8 chroot --userspec=root:root '${1}' /usr/bin/'${apt_cmd}' -y install xfonts-base xfonts-cyrillic xfonts-100dpi xfonts-75dpi'
10351032
sudo sh -c 'LANG=C.UTF-8 chroot --userspec=root:root '${1}' /usr/bin/'${apt_cmd}' -y update'
10361033
sudo sh -c 'LANG=C.UTF-8 chroot --userspec=root:root '${1}' /usr/bin/'${apt_cmd}' -y autoremove'
10371034
sudo sh -c 'LANG=C.UTF-8 chroot --userspec=root:root '${1}' /usr/bin/'${apt_cmd}' -y update'
@@ -1040,7 +1037,7 @@ if [ "${DESKTOP}" == "yes" ]; then
10401037
if [[ "${4}" == "arm64" ]]; then
10411038
if [ "${3}" == "bionic" ]; then
10421039
sudo sh -c 'LANG=C.UTF-8 chroot --userspec=root:root '${1}' /usr/bin/'${apt_cmd}' -y install linux-firmware'
1043-
else
1040+
else
10441041
if [ "${3}" == "stretch" ]; then
10451042
sudo sh -c 'LANG=C.UTF-8 chroot --userspec=root:root '${1}' /usr/bin/'${apt_cmd}' -y -t '${3}'-backports install firmware-ti-connectivity'
10461043
else
@@ -1170,8 +1167,9 @@ EOF'
11701167
sudo cp --preserve=links mali/rel-v2019.1/r8p0-01rel0/aarch64-linux-gnu/common/* ${1}/usr/lib/aarch64-linux-gnu/mali-egl
11711168
sudo cp mali/rel-v2019.1/r8p0-01rel0/aarch64-linux-gnu/x11/libMali.so.8.0 ${1}/usr/lib/aarch64-linux-gnu/mali-egl
11721169
echo "MSG: Copy armsoc driver"
1173-
sudo cp '/home/mib/Projects/2019v1/xilinx-ultra96-reva-2019.1/build/tmp/sysroots-components/aarch64/xf86-video-armsoc/usr/lib/xorg/modules/drivers/armsoc_drv.so' ${1}/usr/lib/xorg/modules/drivers
1174-
# sudo cp '/home/mib/Projects/2018v3/petalinux-rootfs/usr/lib/xorg/modules/drivers/armsoc_drv.so' ${1}/usr/lib/xorg/modules/drivers
1170+
# sudo cp '/home/mib/Projects/2019v1/xilinx-ultra96-reva-2019.1/build/tmp/sysroots-components/aarch64/xf86-video-armsoc/usr/lib/xorg/modules/drivers/armsoc_drv.so' ${1}/usr/lib/xorg/modules/drivers
1171+
sudo cp '/home/mib/Projects/2019v1/my-work/armsoc_drv.so' ${1}/usr/lib/xorg/modules/drivers
1172+
# sudo cp '/home/mib/Projects/2018v3/petalinux-rootfs/usr/lib/xorg/modules/drivers/armsoc_drv.so' ${1}/usr/lib/xorg/modules/drivers
11751173

11761174
else
11771175

0 commit comments

Comments
 (0)