From 3c94c97d22a4712bf79f96de30dfab3e376233f1 Mon Sep 17 00:00:00 2001 From: Luke Childs Date: Thu, 8 Oct 2020 13:55:54 +0700 Subject: [PATCH 1/8] Install Umbrel v0.2.13 (#136) --- config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config b/config index a08edfe..e8b96f2 100644 --- a/config +++ b/config @@ -6,4 +6,4 @@ 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.2.12 +UMBREL_VERSION=0.2.13 From 3cdc2d227a641e509b12fb12adae94bdfabef8cc Mon Sep 17 00:00:00 2001 From: Aaron Dewes Date: Thu, 8 Oct 2020 12:34:27 +0200 Subject: [PATCH 2/8] Use GITHUB_ENV GitHub Actions syntax (#133) --- .github/workflows/on-push.yml | 4 ++-- .github/workflows/on-tag-only.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/on-push.yml b/.github/workflows/on-push.yml index 741d9b4..cc4fbab 100644 --- a/.github/workflows/on-push.yml +++ b/.github/workflows/on-push.yml @@ -38,8 +38,8 @@ jobs: run: | UMBREL_OS_VERSION="$(git describe --tags)" IMAGE_NAME="umbrel-os-${UMBREL_OS_VERSION}" - echo "::set-env name=UMBREL_OS_VERSION::$UMBREL_OS_VERSION" - echo "::set-env name=IMAGE_NAME::$IMAGE_NAME" + echo "UMBREL_OS_VERSION=$UMBREL_OS_VERSION" >> $GITHUB_ENV + echo "IMAGE_NAME=$IMAGE_NAME" >> $GITHUB_ENV - name: Run build script run: | diff --git a/.github/workflows/on-tag-only.yml b/.github/workflows/on-tag-only.yml index 8d9a8c7..d1eb7cc 100644 --- a/.github/workflows/on-tag-only.yml +++ b/.github/workflows/on-tag-only.yml @@ -42,8 +42,8 @@ jobs: run: | UMBREL_OS_VERSION="$(git describe --tags)" IMAGE_NAME="umbrel-os-${UMBREL_OS_VERSION}" - echo "::set-env name=UMBREL_OS_VERSION::$UMBREL_OS_VERSION" - echo "::set-env name=IMAGE_NAME::$IMAGE_NAME" + echo "UMBREL_OS_VERSION=$UMBREL_OS_VERSION" >> $GITHUB_ENV + echo "IMAGE_NAME=$IMAGE_NAME" >> $GITHUB_ENV - name: Run build script run: | From 2e743a21504afc42736fae613bad203e64cfcb9b Mon Sep 17 00:00:00 2001 From: Aaron Dewes Date: Thu, 8 Oct 2020 12:43:40 +0200 Subject: [PATCH 3/8] Allow $UMBREL_BRANCH to be a branch or commit (#134) --- stage2/03-install-umbrel/01-run.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/stage2/03-install-umbrel/01-run.sh b/stage2/03-install-umbrel/01-run.sh index 2391532..21c8775 100755 --- a/stage2/03-install-umbrel/01-run.sh +++ b/stage2/03-install-umbrel/01-run.sh @@ -36,7 +36,8 @@ cd /umbrel if [ -z ${UMBREL_REPO} ]; then curl -L https://github.com/getumbrel/umbrel/archive/v${UMBREL_VERSION}.tar.gz | tar -xz --strip-components=1 else -git clone ${UMBREL_REPO} -b "${UMBREL_BRANCH}" . +git clone ${UMBREL_REPO} . +git checkout "${UMBREL_BRANCH}" fi # Enable Umbrel OS systemd services From bc129baca8168ed045df31c99d189db7784a0a32 Mon Sep 17 00:00:00 2001 From: Mayank Chhabra Date: Sun, 18 Oct 2020 16:00:33 +0530 Subject: [PATCH 4/8] Add amazon links to hardware (#137) --- README.md | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 3e6ab57..6acc59f 100644 --- a/README.md +++ b/README.md @@ -23,10 +23,19 @@ To run Umbrel on: ### Instructions: -1. Download the [latest release of Umbrel OS](https://github.com/getumbrel/umbrel-os/releases/latest), or [build the image from source](#-build-umbrel-os-from-source). -2. Use an image flasher such as [Balena Etcher](https://github.com/balena-io/etcher) to flash the image to a microSD card. -3. Put the microSD card in your Raspberry Pi, attach an external SSD or HDD (to USB 3 port), connect the Pi to your router with an ethernet cable. -4. Turn on the Pi and open http://umbrel.local from any device connected to the same network (it might take a while for it to be accessible). +1. Make sure you've everything ready: + 1. [Raspberry Pi 4 with 4GB or 8GB RAM](https://www.amazon.com/gp/product/B08C4SK5C3/ref=as_li_tl?ie=UTF8&camp=1789&creative=9325&creativeASIN=B08C4SK5C3&linkCode=as2&tag=umbrel08-20&linkId=d3f17fd4813568c4863d239839311d67) + 2. [1TB SSD](https://www.amazon.com/gp/product/B077SF8KMG/ref=as_li_tl?ie=UTF8&tag=umbrel08-20&camp=1789&creative=9325&linkCode=as2&creativeASIN=B077SF8KMG&linkId=5fa12eae55f9ecaed22984bdb9ebb546) + 3. [SSD Enclosure](https://www.amazon.com/gp/product/B01LY97QE8/ref=as_li_tl?ie=UTF8&tag=umbrel08-20&camp=1789&creative=9325&linkCode=as2&creativeASIN=B01LY97QE8&linkId=c73e0df3b8ebd4e5a03f37b7e3b371b3) + 4. [16GB+ microSD Card](https://www.amazon.com/gp/product/B07B98GXQT/ref=as_li_tl?ie=UTF8&tag=umbrel08-20&camp=1789&creative=9325&linkCode=as2&creativeASIN=B07B98GXQT&linkId=e72147bff5eef2a86d9d74300af70180) + 5. [microSD Card Reader](https://www.amazon.com/gp/product/B07G5JV2B5/ref=as_li_tl?ie=UTF8&tag=umbrel08-20&camp=1789&creative=9325&linkCode=as2&creativeASIN=B07G5JV2B5&linkId=474cdf41a783f4ea511b9affa05f33d8) + 6. [Ethernet Cable](https://www.amazon.com/gp/product/B07ZTR9K9Z/ref=as_li_tl?ie=UTF8&tag=umbrel08-20&camp=1789&creative=9325&linkCode=as2&creativeASIN=B07ZTR9K9Z&linkId=41269d57d8fbc8dfaf312893e689f5be) + 7. [Case](https://www.amazon.com/gp/product/B07WG4DW52/ref=as_li_tl?ie=UTF8&tag=umbrel08-20&camp=1789&creative=9325&linkCode=as2&creativeASIN=B07WG4DW52&linkId=738df0605882b2422080f18d8a74e669) + +2. Download the [latest release of Umbrel OS](https://github.com/getumbrel/umbrel-os/releases/latest), or [build the image from source](#-build-umbrel-os-from-source). +3. Use an image flasher such as [Balena Etcher](https://github.com/balena-io/etcher) to flash the image to a microSD card. +4. Put the microSD card in your Raspberry Pi, attach an external SSD or HDD (to USB 3 port), connect the Pi to your router with an ethernet cable. +5. Turn on the Pi and open http://umbrel.local from any device connected to the same network (it might take a while for it to be accessible). **⚠️ All data on the external hard drive will be erased on first boot.** From fe8d95a615593b48c5bdcd7b49babe0188916471 Mon Sep 17 00:00:00 2001 From: Mayank Chhabra Date: Wed, 21 Oct 2020 20:54:09 +0530 Subject: [PATCH 5/8] Drop support for Pi 3 (#138) --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 6acc59f..ca105b3 100644 --- a/README.md +++ b/README.md @@ -17,8 +17,8 @@ Umbrel OS is the operating system of Umbrel Bitcoin and Lightning node. It's bas To run Umbrel on: -- Raspberry Pi 4 (most recommended) — [Download the latest Umbrel OS](https://github.com/getumbrel/umbrel-os/releases/latest) -- Raspberry Pi 3 - [Download Umbrel OS v0.2.10](https://github.com/getumbrel/umbrel-os/releases/tag/v0.2.10) +- Raspberry Pi 4 (recommended) — [Download the latest Umbrel OS](https://github.com/getumbrel/umbrel-os/releases/latest) +- Raspberry Pi 3 (no longer supported) - [Download Umbrel OS v0.2.10](https://github.com/getumbrel/umbrel-os/releases/tag/v0.2.10) - Any other hardware - [Manually install Umbrel](https://github.com/getumbrel/umbrel#-installation) ### Instructions: From 53a781cc8d7642b64caf31a7ee0f05e5f1c93358 Mon Sep 17 00:00:00 2001 From: Aaron Dewes Date: Wed, 4 Nov 2020 13:57:25 +0100 Subject: [PATCH 6/8] Document `UMBREL_REPO` and `UMBREL_VERSION` config variables (#140) --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index ca105b3..fce6bd6 100644 --- a/README.md +++ b/README.md @@ -80,6 +80,10 @@ The `config` file has system defaults which are used when building the image and - `GITHUB_USERNAME` - To automatically login to your Umbrel without typing a password. +- `UMBREL_REPO` - A custom git repo used to download Umbrel. `UMBREL_VERSION` is ignored if this is set, but it is required to also set `UMBREL_BRANCH`. + +- `UMBREL_BRANCH` - The git branch or commit SHA in the custom repo that should be checked out. + Other Raspbian-related stuff can be found in [Raspbian's documentation](https://github.com/RPi-Distro/pi-gen/blob/master/README.md) which is still applicable. --- From 40e0ec5a681bb09fd7c51602d310aa3f2f4832eb Mon Sep 17 00:00:00 2001 From: Mircea Vesa Date: Wed, 4 Nov 2020 17:07:24 +0200 Subject: [PATCH 7/8] Improve stability for ADATA ED600 SSD enclosure (#139) --- stage1/00-boot-files/files/cmdline.txt | 2 +- stage2/00-sys-tweaks/00-patches/07-resize-init.diff | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/stage1/00-boot-files/files/cmdline.txt b/stage1/00-boot-files/files/cmdline.txt index 7c08c9e..36f55bd 100644 --- a/stage1/00-boot-files/files/cmdline.txt +++ b/stage1/00-boot-files/files/cmdline.txt @@ -1 +1 @@ -usb-storage.quirks=152d:1561:u,152d:1576:u,152d:0578:u console=serial0,115200 console=tty1 root=ROOTDEV rootfstype=ext4 elevator=deadline fsck.repair=yes rootwait +usb-storage.quirks=152d:1561:u,152d:1576:u,152d:0578:u,125f:a76a:u console=serial0,115200 console=tty1 root=ROOTDEV rootfstype=ext4 elevator=deadline fsck.repair=yes rootwait diff --git a/stage2/00-sys-tweaks/00-patches/07-resize-init.diff b/stage2/00-sys-tweaks/00-patches/07-resize-init.diff index 5671a9a..8cad5ad 100644 --- a/stage2/00-sys-tweaks/00-patches/07-resize-init.diff +++ b/stage2/00-sys-tweaks/00-patches/07-resize-init.diff @@ -1,5 +1,5 @@ --- stage2.orig/rootfs/boot/cmdline.txt +++ stage2/rootfs/boot/cmdline.txt @@ -1 +1 @@ --usb-storage.quirks=152d:1561:u,152d:1576:u,152d:0578:u console=serial0,115200 console=tty1 root=ROOTDEV rootfstype=ext4 elevator=deadline fsck.repair=yes rootwait -+usb-storage.quirks=152d:1561:u,152d:1576:u,152d:0578:u console=serial0,115200 console=tty1 root=ROOTDEV rootfstype=ext4 elevator=deadline fsck.repair=yes rootwait quiet init=/usr/lib/raspi-config/init_resize.sh +-usb-storage.quirks=152d:1561:u,152d:1576:u,152d:0578:u,125f:a76a:u console=serial0,115200 console=tty1 root=ROOTDEV rootfstype=ext4 elevator=deadline fsck.repair=yes rootwait ++usb-storage.quirks=152d:1561:u,152d:1576:u,152d:0578:u,125f:a76a:u console=serial0,115200 console=tty1 root=ROOTDEV rootfstype=ext4 elevator=deadline fsck.repair=yes rootwait quiet init=/usr/lib/raspi-config/init_resize.sh From 5af9af7eb89845724e37f75e98b58e751d8ae399 Mon Sep 17 00:00:00 2001 From: Mayank Chhabra Date: Fri, 13 Nov 2020 19:11:10 +0530 Subject: [PATCH 8/8] Install Umbrel v0.2.14 (#146) --- config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config b/config index e8b96f2..1cb6288 100644 --- a/config +++ b/config @@ -6,4 +6,4 @@ 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.2.13 +UMBREL_VERSION=0.2.14