diff options
| author | Michael Baisch <baisch@tau-tec.com> | 2019-12-09 18:32:08 +0000 |
|---|---|---|
| committer | Andrei Gherzan <andrei@gherzan.ro> | 2019-12-23 14:13:18 +0000 |
| commit | ef6555c09a1b079d76b22ee48ef5fc234a6f004e (patch) | |
| tree | 55c2875069cc612da5d65107630dd504b1267202 | |
| parent | bc7b654feecceee46bb11800b69994640d03b0ad (diff) | |
| download | meta-raspberrypi-ef6555c09a1b079d76b22ee48ef5fc234a6f004e.tar.gz | |
linux-raspberrypi.inc: no longer set CONFIG_LOCALVERSION to empty string
Fixes: #533
Signed-off-by: Michael Baisch <baisch@tau-tec.com>
| -rw-r--r-- | recipes-kernel/linux/linux-raspberrypi.inc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/recipes-kernel/linux/linux-raspberrypi.inc b/recipes-kernel/linux/linux-raspberrypi.inc index ea7f778..f6e5774 100644 --- a/recipes-kernel/linux/linux-raspberrypi.inc +++ b/recipes-kernel/linux/linux-raspberrypi.inc | |||
| @@ -22,6 +22,8 @@ KBUILD_DEFCONFIG_raspberrypi3-64 ?= "bcmrpi3_defconfig" | |||
| 22 | KBUILD_DEFCONFIG_raspberrypi4 ?= "bcm2711_defconfig" | 22 | KBUILD_DEFCONFIG_raspberrypi4 ?= "bcm2711_defconfig" |
| 23 | KBUILD_DEFCONFIG_raspberrypi4-64 ?= "bcm2711_defconfig" | 23 | KBUILD_DEFCONFIG_raspberrypi4-64 ?= "bcm2711_defconfig" |
| 24 | 24 | ||
| 25 | LINUX_VERSION_EXTENSION ?= "" | ||
| 26 | |||
| 25 | # CMDLINE for raspberrypi | 27 | # CMDLINE for raspberrypi |
| 26 | SERIAL = "${@oe.utils.conditional("ENABLE_UART", "1", "console=serial0,115200", "", d)}" | 28 | SERIAL = "${@oe.utils.conditional("ENABLE_UART", "1", "console=serial0,115200", "", d)}" |
| 27 | CMDLINE ?= "dwc_otg.lpm_enable=0 ${SERIAL} root=/dev/mmcblk0p2 rootfstype=ext4 rootwait" | 29 | CMDLINE ?= "dwc_otg.lpm_enable=0 ${SERIAL} root=/dev/mmcblk0p2 rootfstype=ext4 rootwait" |
| @@ -98,9 +100,6 @@ do_configure_prepend() { | |||
| 98 | mv -f ${B}/.config ${B}/.config.patched | 100 | mv -f ${B}/.config ${B}/.config.patched |
| 99 | CONF_SED_SCRIPT="" | 101 | CONF_SED_SCRIPT="" |
| 100 | 102 | ||
| 101 | # Localversion | ||
| 102 | kernel_configure_variable LOCALVERSION "\"\"" | ||
| 103 | |||
| 104 | if [ "${INITRAMFS_IMAGE_BUNDLE}" = "1" ]; then | 103 | if [ "${INITRAMFS_IMAGE_BUNDLE}" = "1" ]; then |
| 105 | kernel_configure_variable OVERLAY_FS y | 104 | kernel_configure_variable OVERLAY_FS y |
| 106 | kernel_configure_variable SQUASHFS y | 105 | kernel_configure_variable SQUASHFS y |
