showpiece/showpiece-pi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 5 Wiki Activity

Merge branch 'master' into arm64

Browse Source
This commit is contained in:
Serge Schneider 2024-11-11 13:34:14 +00:00
commit 919f1e86b9
6 changed files with 7 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
README.md
View File

@ -37,7 +37,7 @@ can do so with:
git clone https://github.com/RPI-Distro/pi-gen.git git clone https://github.com/RPI-Distro/pi-gen.git
``` ```
`--depth 1` can be added afer `git clone` to create a shallow clone, only containing `--depth 1` can be added after `git clone` to create a shallow clone, only containing
the latest revision of the repository. Do not do this on your development machine. the latest revision of the repository. Do not do this on your development machine.
Also, be careful to clone the repository to a base path **NOT** containing spaces. Also, be careful to clone the repository to a base path **NOT** containing spaces.
@ -230,12 +230,12 @@ This is parsed after `config` so can be used to override values set there.
The following process is followed to build images: The following process is followed to build images:
* Interate through all of the stage directories in alphanumeric order * Iterate through all of the stage directories in alphanumeric order
* Bypass a stage directory if it contains a file called * Bypass a stage directory if it contains a file called
"SKIP" "SKIP"
* Run the script ```prerun.sh``` which is generally just used to copy the build * Run the script `prerun.sh` which is generally just used to copy the build
directory between stages. directory between stages.
* In each stage directory iterate through each subdirectory and then run each of the * In each stage directory iterate through each subdirectory and then run each of the
@ -256,7 +256,7 @@ The following process is followed to build images:
separated, per line. separated, per line.
- **00-packages-nr** - As 00-packages, except these will be installed using - **00-packages-nr** - As 00-packages, except these will be installed using
the ```--no-install-recommends -y``` parameters to apt-get. the `--no-install-recommends -y` parameters to apt-get.
- **00-patches** - A directory containing patch files to be applied, using quilt. - **00-patches** - A directory containing patch files to be applied, using quilt.
If a file named 'EDIT' is present in the directory, the build process will If a file named 'EDIT' is present in the directory, the build process will
@ -399,8 +399,8 @@ follows:
* Run build.sh to build all stages * Run build.sh to build all stages
* Add SKIP files to the earlier successfully built stages * Add SKIP files to the earlier successfully built stages
* Modify the last stage * Modify the last stage
* Rebuild just the last stage using ```sudo CLEAN=1 ./build.sh``` (or, for docker builds * Rebuild just the last stage using `sudo CLEAN=1 ./build.sh` (or, for docker builds
```PRESERVE_CONTAINER=1 CONTINUE=1 CLEAN=1 ./build-docker.sh```) `PRESERVE_CONTAINER=1 CONTINUE=1 CLEAN=1 ./build-docker.sh`)
* Once you're happy with the image you can remove the SKIP_IMAGES files and * Once you're happy with the image you can remove the SKIP_IMAGES files and
export your image to test export your image to test

2
scripts/common
View File

@ -13,7 +13,7 @@ bootstrap(){
BOOTSTRAP_ARGS+=(--include gnupg) 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+=(--exclude=info) BOOTSTRAP_ARGS+=(--exclude=info,ifupdown)
BOOTSTRAP_ARGS+=(--include=ca-certificates) BOOTSTRAP_ARGS+=(--include=ca-certificates)
BOOTSTRAP_ARGS+=("$@") BOOTSTRAP_ARGS+=("$@")
printf -v BOOTSTRAP_STR '%q ' "${BOOTSTRAP_ARGS[@]}" printf -v BOOTSTRAP_STR '%q ' "${BOOTSTRAP_ARGS[@]}"

2
stage1/01-sys-tweaks/00-run.sh
View File

@ -1,7 +1,5 @@
#!/bin/bash -e #!/bin/bash -e
install -d "${ROOTFS_DIR}/etc/systemd/system/getty@tty1.service.d"
install -m 644 files/noclear.conf "${ROOTFS_DIR}/etc/systemd/system/getty@tty1.service.d/noclear.conf"
install -v -m 644 files/fstab "${ROOTFS_DIR}/etc/fstab" install -v -m 644 files/fstab "${ROOTFS_DIR}/etc/fstab"
on_chroot << EOF on_chroot << EOF

2
stage1/01-sys-tweaks/files/noclear.conf
View File

@ -1,2 +0,0 @@
[Service]
TTYVTDisallocate=no

2
stage2/01-sys-tweaks/01-run.sh
View File

@ -6,8 +6,6 @@ install -m 644 files/50raspi "${ROOTFS_DIR}/etc/apt/apt.conf.d/"
install -m 644 files/console-setup "${ROOTFS_DIR}/etc/default/" install -m 644 files/console-setup "${ROOTFS_DIR}/etc/default/"
install -m 755 files/rc.local "${ROOTFS_DIR}/etc/"
if [ -n "${PUBKEY_SSH_FIRST_USER}" ]; then if [ -n "${PUBKEY_SSH_FIRST_USER}" ]; then
install -v -m 0700 -o 1000 -g 1000 -d "${ROOTFS_DIR}"/home/"${FIRST_USER_NAME}"/.ssh install -v -m 0700 -o 1000 -g 1000 -d "${ROOTFS_DIR}"/home/"${FIRST_USER_NAME}"/.ssh
echo "${PUBKEY_SSH_FIRST_USER}" >"${ROOTFS_DIR}"/home/"${FIRST_USER_NAME}"/.ssh/authorized_keys echo "${PUBKEY_SSH_FIRST_USER}" >"${ROOTFS_DIR}"/home/"${FIRST_USER_NAME}"/.ssh/authorized_keys

20
stage2/01-sys-tweaks/files/rc.local
View File

@ -1,20 +0,0 @@
#!/bin/sh -e
#
# rc.local
#
# This script is executed at the end of each multiuser runlevel.
# Make sure that the script will "exit 0" on success or any other
# value on error.
#
# In order to enable or disable this script just change the execution
# bits.
#
# By default this script does nothing.
# Print the IP address
_IP=$(hostname -I) || true
if [ "$_IP" ]; then
printf "My IP address is %s\n" "$_IP"
fi
exit 0