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.

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

WIP: Update buildroot #401

Open
wants to merge 17 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
10 changes: 6 additions & 4 deletions BUILDME.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ KERNEL="4.19"

# Final directory where NOOBS files will be copied to
NOOBS_OUTPUT_DIR="output"
export QT_SELECT=4
export QT_SELECT=5

function get_package_version {
PACKAGE=$1
Expand Down Expand Up @@ -51,7 +51,7 @@ function update_github_package_version {

function get_kernel_version {
CONFIG_FILE=.config
CONFIG_VAR=BR2_LINUX_KERNEL_VERSION
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This variable is no longer used for custom repos.

CONFIG_VAR=BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION
grep -E "^$CONFIG_VAR=\".+\"$" "$CONFIG_FILE" | tr -d '"' | cut -d= -f2
}

Expand All @@ -76,8 +76,6 @@ function update_github_kernel_version {
else
CONFIG_VAR=BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION
sed -ri "s/(^$CONFIG_VAR=\")[0-9a-f]+(\")$/\1$GITREV\2/" "$CONFIG_FILE"
CONFIG_VAR=BR2_LINUX_KERNEL_VERSION
sed -ri "s/(^$CONFIG_VAR=\")[0-9a-f]+(\")$/\1$GITREV\2/" "$CONFIG_FILE"
Comment on lines -79 to -80
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same as above, This variable is no longer used for custom repos.

echo "$PACKAGE ($BRANCH) updated to version $GITREV"
fi
fi
Expand Down Expand Up @@ -246,6 +244,10 @@ if [ $SKIP_KERNEL_REBUILD -ne 1 ]; then
echo "Warning: kernel armv6 in '$NOOBS_OUTPUT_DIR' directory hasn't been updated"
fi

# Fix for modular kernel: Force recreation of rootfs image to include modules
rm "$IMAGES_DIR/rootfs.squashfs"
make

else
echo "Warning: kernels in '$NOOBS_OUTPUT_DIR' directory haven't been updated"
fi
Expand Down
Loading