Skip to content

Commit e790dee

Browse files
luigifcruzluigifcruz
authored
[WIP] ARM64 Image (#71)
* initial updates * disable X86 SIMD for uhd * add dependencies to hackrf * replace swig with pybind * add gnuradio 3.9 dependencies * Install pybind11 via pip * compile pybind11 from source * fix volk build script perm * ignore apt packages for dump1090 * fix dpkg ignore dependencies * remove dump1090 * update foxtelem * update foxtelem filename * upgrade to bullseye * change i386 to arm32v7 docker * revert arch detection * use native docker image to build * Add missing dependency. * fix dependency * add dependency * Fix dependencies. * add raspi-config package * update packages to bullseye * add missing packages * remove pip install of ninja and cmake * set uhd arch to armhf * nuke python2 * change armhf to armv6-m * add hardware float to the armv6 flags * tweak armv6 build * disable neon for armv6 * fix rtlsdr-airband build * Initial ARM64 Support * remove gpg from rpi * add gnupg * Update packages. * Fix packages arch. * Enable multithreaded XZ. * add neon flag * Fix limesuite bug. * patch cpu_features for arm64 * fix branch of volk * update cmake command of volk * add debug points * clean debug * turn cpu_features off * add debug * Remove setarch. * delete ld preload * remove preload thingy * merge v6.0 changes * Delete inspectrum.desktop * update sdrplay driver to arm64 * Fix hostname address #73.
1 parent 4c736b5 commit e790dee

File tree

18 files changed

+35
-41
lines changed

18 files changed

+35
-41
lines changed

‎export-image/04-finalise/01-run.sh‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,6 @@ fi
1818

1919
rm -f "${ROOTFS_DIR}/usr/bin/qemu-arm-static"
2020

21-
if [ "${USE_QEMU}" != "1" ]; then
22-
if [ -e "${ROOTFS_DIR}/etc/ld.so.preload.disabled" ]; then
23-
mv "${ROOTFS_DIR}/etc/ld.so.preload.disabled" "${ROOTFS_DIR}/etc/ld.so.preload"
24-
fi
25-
fi
26-
2721
rm -f "${ROOTFS_DIR}/etc/network/interfaces.dpkg-old"
2822

2923
rm -f "${ROOTFS_DIR}/etc/apt/sources.list~"

‎scripts/common‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,21 @@ bootstrap(){
77
local BOOTSTRAP_CMD=debootstrap
88
local BOOTSTRAP_ARGS=()
99

10-
export http_proxy=${APT_PROXY}
10+
#export http_proxy=${APT_PROXY}
1111

1212
if [ "$(dpkg --print-architecture)" != "armhf" ] && [ "$(dpkg --print-architecture)" != "aarch64" ]; then
1313
BOOTSTRAP_CMD=qemu-debootstrap
1414
fi
1515

16-
BOOTSTRAP_ARGS+=(--arch armhf)
16+
BOOTSTRAP_ARGS+=(--arch arm64)
17+
BOOTSTRAP_ARGS+=(--include gnupg)
1718
BOOTSTRAP_ARGS+=(--components "main,contrib,non-free")
18-
BOOTSTRAP_ARGS+=(--keyring "${STAGE_DIR}/files/raspberrypi.gpg")
19+
#BOOTSTRAP_ARGS+=(--keyring "${STAGE_DIR}/files/raspberrypi.gpg")
1920
BOOTSTRAP_ARGS+=(--exclude=info)
2021
BOOTSTRAP_ARGS+=("$@")
2122
printf -v BOOTSTRAP_STR '%q ' "${BOOTSTRAP_ARGS[@]}"
2223

23-
setarch linux32 capsh --drop=cap_setfcap -- -c "'${BOOTSTRAP_CMD}' $BOOTSTRAP_STR" || true
24+
capsh --drop=cap_setfcap -- -c "'${BOOTSTRAP_CMD}' $BOOTSTRAP_STR" || true
2425

2526
if [ -d "$2/debootstrap" ] && ! rmdir "$2/debootstrap"; then
2627
cp "$2/debootstrap/debootstrap.log" "${STAGE_WORK_DIR}"
@@ -93,7 +94,7 @@ on_chroot() {
9394
mount --bind /sys "${ROOTFS_DIR}/sys"
9495
fi
9596

96-
setarch linux32 capsh --drop=cap_setfcap "--chroot=${ROOTFS_DIR}/" -- -e "$@"
97+
capsh --drop=cap_setfcap "--chroot=${ROOTFS_DIR}/" -- -e "$@"
9798
}
9899
export -f on_chroot
99100

‎stage0/00-configure-apt/00-run.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ fi
1414

1515
on_chroot apt-key add - < files/raspberrypi.gpg.key
1616
on_chroot << EOF
17+
dpkg --add-architecture armhf
1718
apt-get update
1819
apt-get dist-upgrade -y
1920
EOF

‎stage0/00-configure-apt/files/sources.list‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1-
deb http://raspbian.raspberrypi.org/raspbian/ RELEASE main contrib non-free rpi
2-
# Uncomment line below then 'apt-get update' to enable 'apt-get source'
3-
#deb-src http://raspbian.raspberrypi.org/raspbian/ RELEASE main contrib non-free rpi
1+
deb http://deb.debian.org/debian RELEASE main contrib non-free
2+
deb http://security.debian.org/debian-security RELEASE-security main contrib non-free
3+
deb http://deb.debian.org/debian RELEASE-updates main contrib non-free
4+
# Uncomment deb-src lines below then 'apt-get update' to enable 'apt-get source'
5+
#deb-src http://deb.debian.org/debian RELEASE main contrib non-free
6+
#deb-src http://security.debian.org/debian-security RELEASE-security main contrib non-free
7+
#deb-src http://deb.debian.org/debian RELEASE-updates main contrib non-free

‎stage0/prerun.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash -e
22

33
if [ ! -d "${ROOTFS_DIR}" ] || [ "${USE_QCOW2}" = "1" ]; then
4-
bootstrap ${RELEASE} "${ROOTFS_DIR}" http://raspbian.raspberrypi.org/raspbian/
4+
bootstrap ${RELEASE} "${ROOTFS_DIR}" http://deb.debian.org/debian/
55
fi

‎stage1/00-boot-files/files/config.txt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,9 @@ display_auto_detect=1
6262
dtoverlay=vc4-kms-v3d
6363
max_framebuffers=2
6464

65+
# Run in 64-bit mode
66+
arm_64bit=1
67+
6568
# Disable compensation for displays with overscan
6669
disable_overscan=1
6770

‎stage2/01-sys-tweaks/01-run.sh‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ s/^#?[[:blank:]]*PasswordAuthentication[[:blank:]]*yes[[:blank:]]*$/PasswordAuth
2424
fi
2525

2626
on_chroot << EOF
27+
gcc -march=native -Q --help=target
28+
echo "++++++++++++++++++++++++++++++++++++"
2729
systemctl disable hwclock.sh
2830
systemctl disable nfs-common
2931
systemctl disable rpcbind

‎stage3/00-install-packages/00-packages‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
gstreamer1.0-x gstreamer1.0-omx gstreamer1.0-plugins-base gstreamer1.0-plugins-good gstreamer1.0-plugins-bad gstreamer1.0-alsa gstreamer1.0-libav
1+
gstreamer1.0-x gstreamer1.0-plugins-base gstreamer1.0-plugins-good gstreamer1.0-plugins-bad gstreamer1.0-alsa gstreamer1.0-libav
22
qpdfview gtk2-engines alsa-utils
33
desktop-base
44
git

‎stage3/00-install-packages/00-packages-nr‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
xserver-xorg-video-fbdev xserver-xorg xinit xserver-xorg-video-fbturbo
1+
xserver-xorg xinit
22
mousepad
33
lxde lxtask menu-xdg
44
zenity xdg-utils
55
gvfs-backends gvfs-fuse
6-
lightdm gnome-themes-standard-data gnome-icon-theme
6+
lightdm gnome-themes-standard gnome-icon-theme

‎stage3/00-install-packages/01-run.sh‎

Lines changed: 0 additions & 8 deletions
This file was deleted.

0 commit comments

Comments
 (0)