Skip to content

Commit fb97264

Browse files
committed
Use an explicit kernel version too (and record it in BUILD-DATA)
1 parent 1539d36 commit fb97264

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

BUILDME.sh

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,13 @@ function update_github_package_version {
4848
}
4949

5050

51+
function get_kernel_version {
52+
CONFIG_FILE=.config
53+
CONFIG_VAR=BR2_LINUX_KERNEL_VERSION
54+
grep -E "^$CONFIG_VAR=\".+\"$" "$CONFIG_FILE" | tr -d '"' | cut -d= -f2
55+
}
56+
57+
5158
cd buildroot
5259

5360
# WARNING: don't try changing these - you'll break buildroot
@@ -100,6 +107,7 @@ echo "NOOBS Version: $(git describe)" >> "$BUILD_INFO"
100107
echo "NOOBS Git HEAD @ $(git rev-parse --verify HEAD)" >> "$BUILD_INFO"
101108
echo "rpi-userland Git master @ $(get_package_version rpi-userland)" >> "$BUILD_INFO"
102109
echo "rpi-firmware Git master @ $(get_package_version rpi-firmware)" >> "$BUILD_INFO"
110+
echo "rpi-linux Git rpi-3.6.y @ $(get_kernel_version)" >> "$BUILD_INFO"
103111

104112
cd ..
105113

buildroot/.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1351,8 +1351,8 @@ BR2_LINUX_KERNEL=y
13511351
# BR2_LINUX_KERNEL_CUSTOM_TARBALL is not set
13521352
BR2_LINUX_KERNEL_CUSTOM_GIT=y
13531353
BR2_LINUX_KERNEL_CUSTOM_GIT_REPO_URL="git://github.com/raspberrypi/linux.git"
1354-
BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION="rpi-3.6.y"
1355-
BR2_LINUX_KERNEL_VERSION="rpi-3.6.y"
1354+
BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION="2a8d45ec0883e3cbdce920855b3461ac77308a5f"
1355+
BR2_LINUX_KERNEL_VERSION="2a8d45ec0883e3cbdce920855b3461ac77308a5f"
13561356
BR2_LINUX_KERNEL_PATCH="$(TOPDIR)/board/raspberrypi/kernel-patches/"
13571357
# BR2_LINUX_KERNEL_USE_DEFCONFIG is not set
13581358
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y

0 commit comments

Comments
 (0)