Browse Source

Remove pi-gen leftovers (#68)

swap
Aaron Dewes 5 years ago
committed by GitHub
parent
commit
32014cefe4
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 12
      build.sh
  2. 2
      config
  3. 6
      export-image/04-finalise/01-run.sh
  4. 2
      scripts/common
  5. 2
      stage2/02-accept-mathematica-eula/00-debconf
  6. 0
      stage2/02-set-timezone/02-run.sh
  7. 0
      stage2/03-install-umbrel/00-packages
  8. 0
      stage2/03-install-umbrel/01-run.sh
  9. 0
      stage2/04-set-umbrel-os-version/00-patches/01-profile.diff
  10. 0
      stage2/04-set-umbrel-os-version/00-patches/series
  11. 0
      stage2/04-set-umbrel-os-version/01-run.sh
  12. 0
      stage2/04-set-umbrel-os-version/files/umbrel

12
build.sh

@ -143,8 +143,8 @@ do
esac
done
export PI_GEN=${PI_GEN:-pi-gen}
export PI_GEN_REPO=${PI_GEN_REPO:-https://github.com/RPi-Distro/pi-gen}
export BUILD_SCRIPTS="${BUILD_SCRIPTS:-Umbrel OS official build scripts}"
export BUILD_SCRIPTS_REPO="${BUILD_SCRIPTS_REPO:-https://github.com/getumbrel/umbrel-os}"
if [ -z "${IMG_NAME}" ]; then
echo "IMG_NAME not set" 1>&2
@ -162,14 +162,14 @@ export DEPLOY_DIR=${DEPLOY_DIR:-"${BASE_DIR}/deploy"}
export DEPLOY_ZIP="${DEPLOY_ZIP:-1}"
export LOG_FILE="${WORK_DIR}/build.log"
export TARGET_HOSTNAME=${TARGET_HOSTNAME:-raspberrypi}
export TARGET_HOSTNAME=${TARGET_HOSTNAME:-umbrel}
export FIRST_USER_NAME=${FIRST_USER_NAME:-pi}
export FIRST_USER_PASS=${FIRST_USER_PASS:-raspberry}
export FIRST_USER_NAME=${FIRST_USER_NAME:-umbrel}
export FIRST_USER_PASS=${FIRST_USER_PASS:-moneyprintergobrrr}
export WPA_ESSID
export WPA_PASSWORD
export WPA_COUNTRY
export ENABLE_SSH="${ENABLE_SSH:-0}"
export ENABLE_SSH="${ENABLE_SSH:-1}"
export LOCALE_DEFAULT="${LOCALE_DEFAULT:-en_GB.UTF-8}"

2
config

@ -4,4 +4,6 @@ TIMEZONE_DEFAULT="Etc/UTC"
FIRST_USER_NAME=umbrel
FIRST_USER_PASS=moneyprintergobrrr
ENABLE_SSH=1
BUILD_SCRIPTS="Umbrel OS official build scripts"
BUILD_SCRIPTS_REPO="https://github.com/getumbrel/umbrel-os"
UMBREL_VERSION=0.1.7-beta

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

@ -17,7 +17,7 @@ if [ -d "${ROOTFS_DIR}/home/${FIRST_USER_NAME}/.config" ]; then
fi
rm -f "${ROOTFS_DIR}/etc/apt/apt.conf.d/51cache"
rm -f "${ROOTFS_DIR}/usr/bin/qemu-arm-static"
rm -f "${ROOTFS_DIR}/usr/bin/qemu-aarch64-static"
if [ "${USE_QEMU}" != "1" ]; then
if [ -e "${ROOTFS_DIR}/etc/ld.so.preload.disabled" ]; then
@ -54,9 +54,9 @@ rm -f "${ROOTFS_DIR}/root/.vnc/private.key"
rm -f "${ROOTFS_DIR}/etc/vnc/updateid"
update_issue "$(basename "${EXPORT_DIR}")"
install -m 644 "${ROOTFS_DIR}/etc/rpi-issue" "${ROOTFS_DIR}/boot/issue.txt"
install -m 644 "${ROOTFS_DIR}/etc/umbrel-issue" "${ROOTFS_DIR}/boot/issue.txt"
cp "$ROOTFS_DIR/etc/rpi-issue" "$INFO_FILE"
cp "$ROOTFS_DIR/etc/umbrel-issue" "$INFO_FILE"
{

2
scripts/common

@ -96,6 +96,6 @@ on_chroot() {
export -f on_chroot
update_issue() {
echo -e "Raspberry Pi reference ${IMG_DATE}\nGenerated using ${PI_GEN}, ${PI_GEN_REPO}, ${GIT_HASH}, ${1}" > "${ROOTFS_DIR}/etc/rpi-issue"
echo -e "Umbrel OS built on ${IMG_DATE}\nGenerated using ${BUILD_SCRIPTS}, ${BUILD_SCRIPTS_REPO}, ${GIT_HASH}, ${1}" > "${ROOTFS_DIR}/etc/umbrel-issue"
}
export -f update_issue

2
stage2/02-accept-mathematica-eula/00-debconf

@ -1,2 +0,0 @@
# Do you accept the Wolfram - Raspberry Pi® Bundle License Agreement?
wolfram-engine shared/accepted-wolfram-eula boolean true

0
stage2/03-set-timezone/02-run.sh → stage2/02-set-timezone/02-run.sh

0
stage2/04-install-umbrel/00-packages → stage2/03-install-umbrel/00-packages

0
stage2/04-install-umbrel/01-run.sh → stage2/03-install-umbrel/01-run.sh

0
stage2/05-set-umbrel-os-version/00-patches/01-profile.diff → stage2/04-set-umbrel-os-version/00-patches/01-profile.diff

0
stage2/05-set-umbrel-os-version/00-patches/series → stage2/04-set-umbrel-os-version/00-patches/series

0
stage2/05-set-umbrel-os-version/01-run.sh → stage2/04-set-umbrel-os-version/01-run.sh

0
stage2/05-set-umbrel-os-version/files/umbrel → stage2/04-set-umbrel-os-version/files/umbrel

Loading…
Cancel
Save