logan/touchprint
1
0
Fork 0
Code Issues 2 Pull requests Releases 2 Wiki Activity

Made appropriate changes to make 64 bit compatible

Browse source
This commit is contained in:
Logan G 2020-08-16 16:30:04 -06:00
parent a3fff10d3f
commit 926851361c
Signed by: logan
GPG key ID: E328528C921E7A7A
9 changed files with 17 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
scripts/common
View file

@ -9,17 +9,18 @@ bootstrap(){
export http_proxy=${APT_PROXY} export http_proxy=${APT_PROXY}
if [ "$(dpkg --print-architecture)" != "armhf" ] && [ "$(dpkg --print-architecture)" != "aarch64" ]; then if [ "$(dpkg --print-architecture)" != "armhf" ] && [ "$(dpkg --print-architecture)" != "arm64" ]; then
BOOTSTRAP_CMD=qemu-debootstrap BOOTSTRAP_CMD=qemu-debootstrap
fi fi
BOOTSTRAP_ARGS+=(--arch armhf) BOOTSTRAP_ARGS+=(--arch arm64)
BOOTSTRAP_ARGS+=(--include gnupg)
BOOTSTRAP_ARGS+=(--components "main,contrib,non-free") BOOTSTRAP_ARGS+=(--components "main,contrib,non-free")
BOOTSTRAP_ARGS+=(--keyring "${STAGE_DIR}/files/raspberrypi.gpg") #BOOTSTRAP_ARGS+=(--keyring "${STAGE_DIR}/files/raspberrypi.gpg")
BOOTSTRAP_ARGS+=("$@") BOOTSTRAP_ARGS+=("$@")
printf -v BOOTSTRAP_STR '%q ' "${BOOTSTRAP_ARGS[@]}" printf -v BOOTSTRAP_STR '%q ' "${BOOTSTRAP_ARGS[@]}"
setarch linux32 capsh --drop=cap_setfcap -- -c "'${BOOTSTRAP_CMD}' $BOOTSTRAP_STR" || true capsh --drop=cap_setfcap -- -c "'${BOOTSTRAP_CMD}' $BOOTSTRAP_STR" || true
if [ -d "$2/debootstrap" ]; then if [ -d "$2/debootstrap" ]; then
rmdir "$2/debootstrap" rmdir "$2/debootstrap"

1
stage0/00-configure-apt/00-run.sh
View file

@ -14,6 +14,7 @@ fi
on_chroot apt-key add - < files/raspberrypi.gpg.key on_chroot apt-key add - < files/raspberrypi.gpg.key
on_chroot << EOF on_chroot << EOF
dpkg --add-architecture armhf
apt-get update apt-get update
apt-get dist-upgrade -y apt-get dist-upgrade -y
EOF EOF

10
stage0/00-configure-apt/files/sources.list
View file

@ -1,3 +1,7 @@
deb http://raspbian.raspberrypi.org/raspbian/ RELEASE main contrib non-free rpi deb http://deb.debian.org/debian RELEASE main contrib non-free
# Uncomment line below then 'apt-get update' to enable 'apt-get source' deb http://deb.debian.org/debian-security/ RELEASE/updates main contrib non-free
#deb-src http://raspbian.raspberrypi.org/raspbian/ RELEASE main contrib non-free rpi deb http://deb.debian.org/debian RELEASE-updates main contrib non-free
# Uncomment deb-src lines below then 'apt-get update' to enable 'apt-get source'
#deb-src http://deb.debian.org/debian RELEASE main contrib non-free
#deb-src http://deb.debian.org/debian-security/ RELEASE/updates main contrib non-free
#deb-src http://deb.debian.org/debian RELEASE-updates main contrib non-free

2
stage0/prerun.sh
View file

@ -1,5 +1,5 @@
#!/bin/bash -e #!/bin/bash -e
if [ ! -d "${ROOTFS_DIR}" ]; then if [ ! -d "${ROOTFS_DIR}" ]; then
bootstrap ${RELEASE} "${ROOTFS_DIR}" http://raspbian.raspberrypi.org/raspbian/ bootstrap ${RELEASE} "${ROOTFS_DIR}" http://deb.debian.org/debian/
fi fi

7
stage1/00-boot-files/files/config.txt
View file

@ -59,11 +59,10 @@ dtparam=audio=on
# Memory split # Memory split
gpu_mem=128 gpu_mem=128
[pi4] # Enable DRM VC4 V3D driver
# Enable DRM VC4 V3D driver on top of the dispmanx display stack dtoverlay=vc4-kms-v3d
dtoverlay=vc4-fkms-v3d
max_framebuffers=2 max_framebuffers=2
[all] [all]
#dtoverlay=vc4-fkms-v3d #dtoverlay=vc4-fkms-v3d
arm_64bit=1

1
stage2/00-copies-and-fills/01-packages
View file

@ -1 +0,0 @@
raspi-copies-and-fills

6
stage2/00-copies-and-fills/02-run.sh
View file

@ -1,6 +0,0 @@
#!/bin/bash -e
if [ -f "${ROOTFS_DIR}/etc/ld.so.preload" ]; then
mv "${ROOTFS_DIR}/etc/ld.so.preload" "${ROOTFS_DIR}/etc/ld.so.preload.disabled"
fi

1
stage3/00-install-packages/00-packages
View file

@ -1,5 +1,4 @@
gstreamer1.0-x gstreamer1.0-x
gstreamer1.0-omx
gstreamer1.0-plugins-base gstreamer1.0-plugins-base
gstreamer1.0-plugins-good gstreamer1.0-plugins-good
gstreamer1.0-plugins-bad gstreamer1.0-plugins-bad

2
stage3/00-install-packages/00-packages-nr
View file

@ -1,7 +1,5 @@
xserver-xorg-video-fbdev
xserver-xorg xserver-xorg
xinit xinit
xserver-xorg-video-fbturbo
menu-xdg menu-xdg
zenity zenity
xdg-utils xdg-utils