From aeecabfbff5f42cda84bfa1c95802dd1bcc5f597 Mon Sep 17 00:00:00 2001
From: Daniel M <daniel.q.mueller@stud.h-da.de>
Date: Thu, 20 Jan 2022 14:57:27 +0100
Subject: [PATCH] Update from pi-gen
- Manually merged changes from [pi-gen arm64](https://github.com/RPi-Distro/pi-gen/tree/arm64)
- Removed files that didn't belong in arm64 branch to begin with
---
scripts/common | 2 +-
stage2/00-copies-and-fills/01-packages | 1 -
stage2/00-copies-and-fills/02-run.sh | 6 ------
stage2/02-net-tweaks/files/wait.conf | 3 ---
stage3/00-install-packages/01-run.sh | 8 --------
stage5/EXPORT_IMAGE | 4 ----
6 files changed, 1 insertion(+), 23 deletions(-)
delete mode 100644 stage2/00-copies-and-fills/01-packages
delete mode 100755 stage2/00-copies-and-fills/02-run.sh
delete mode 100644 stage2/02-net-tweaks/files/wait.conf
delete mode 100755 stage3/00-install-packages/01-run.sh
delete mode 100644 stage5/EXPORT_IMAGE
diff --git a/scripts/common b/scripts/common
index 690403f..394b398 100644
--- a/scripts/common
+++ b/scripts/common
@@ -94,7 +94,7 @@ on_chroot() {
mount --bind /sys "${ROOTFS_DIR}/sys"
fi
- setarch linux32 capsh --drop=cap_setfcap "--chroot=${ROOTFS_DIR}/" -- -e "$@"
+ capsh --drop=cap_setfcap "--chroot=${ROOTFS_DIR}/" -- -e "$@"
}
export -f on_chroot
diff --git a/stage2/00-copies-and-fills/01-packages b/stage2/00-copies-and-fills/01-packages
deleted file mode 100644
index 283c290..0000000
--- a/stage2/00-copies-and-fills/01-packages
+++ /dev/null
@@ -1 +0,0 @@
-raspi-copies-and-fills
diff --git a/stage2/00-copies-and-fills/02-run.sh b/stage2/00-copies-and-fills/02-run.sh
deleted file mode 100755
index 366ac24..0000000
--- a/stage2/00-copies-and-fills/02-run.sh
+++ /dev/null
@@ -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
-
diff --git a/stage2/02-net-tweaks/files/wait.conf b/stage2/02-net-tweaks/files/wait.conf
deleted file mode 100644
index 595cc2d..0000000
--- a/stage2/02-net-tweaks/files/wait.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-[Service]
-ExecStart=
-ExecStart=/usr/lib/dhcpcd5/dhcpcd -q -w
diff --git a/stage3/00-install-packages/01-run.sh b/stage3/00-install-packages/01-run.sh
deleted file mode 100755
index 92ff2fc..0000000
--- a/stage3/00-install-packages/01-run.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash -e
-
-on_chroot << EOF
-update-alternatives --install /usr/bin/x-www-browser \
- x-www-browser /usr/bin/chromium-browser 86
-update-alternatives --install /usr/bin/gnome-www-browser \
- gnome-www-browser /usr/bin/chromium-browser 86
-EOF
\ No newline at end of file
diff --git a/stage5/EXPORT_IMAGE b/stage5/EXPORT_IMAGE
deleted file mode 100644
index a81a844..0000000
--- a/stage5/EXPORT_IMAGE
+++ /dev/null
@@ -1,4 +0,0 @@
-IMG_SUFFIX="-full"
-if [ "${USE_QEMU}" = "1" ]; then
- export IMG_SUFFIX="${IMG_SUFFIX}-qemu"
-fi
--
GitLab