Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DietPi-Patch | Migrate new SBCs to master branch now, as v6.29 is to be released #3504

Merged
merged 1 commit into from
May 3, 2020
Merged

DietPi-Patch | Migrate new SBCs to master branch now, as v6.29 is to be released #3504

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions dietpi/patch_file
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,16 +141,16 @@ _EOF_
# - DietPi-Update includes G_VERSIONDB_SAVE after every subversion patch from v6.27 on.
(( $1 )) && G_DIETPI_VERSION_SUB=$1

# Migrate newly supported SBCs from dev to beta branch, will be changed to master right before release!
# Migrate newly supported SBCs from dev to master branch
if (( $G_DIETPI_VERSION_SUB < 29 )) && [[ -f '/etc/.dietpi_hw_model_identifier' ]]; then

# NanoPi M4v2 (58)
# Pine H64 (45)
# ROCK Pi S (73)
if [[ $(</etc/.dietpi_hw_model_identifier) =~ ^(58|45|73)$ ]] && grep -q '^[[:blank:]]*DEV_GITBRANCH=dev' /boot/dietpi.txt; then

G_DIETPI-NOTIFY 2 'Migrating from development to DietPi beta branch'
G_CONFIG_INJECT 'DEV_GITBRANCH=' 'DEV_GITBRANCH=beta' /boot/dietpi.txt
G_DIETPI-NOTIFY 2 'Migrating from development to DietPi master branch'
G_CONFIG_INJECT 'DEV_GITBRANCH=' 'DEV_GITBRANCH=master' /boot/dietpi.txt

fi

Expand Down