From 7a514684de3e29cda5ef8eccf84fb7dfb24583ae Mon Sep 17 00:00:00 2001
From: guowenxue <guowenxue@gmail.com>
Date: Sat, 08 Oct 2022 17:07:21 +0800
Subject: [PATCH] update hardknott for kernel and add some tools in image
---
yocto/meta-igkboard/hardknott/recipes-images/igkboard/linuxsys-image.bb | 63 +++++++++++++++----------------
yocto/meta-igkboard/hardknott/conf/machine/igkboard.conf | 2
yocto/meta-igkboard/hardknott/recipes-kernel/linux/linux-imx-headers_5.10.bbappend | 2
yocto/meta-igkboard/hardknott/recipes-kernel/linux/linux-imx_5.10.bbappend | 10 +---
4 files changed, 35 insertions(+), 42 deletions(-)
diff --git a/yocto/meta-igkboard/hardknott/conf/machine/igkboard.conf b/yocto/meta-igkboard/hardknott/conf/machine/igkboard.conf
index 479cfbc..5d27e11 100644
--- a/yocto/meta-igkboard/hardknott/conf/machine/igkboard.conf
+++ b/yocto/meta-igkboard/hardknott/conf/machine/igkboard.conf
@@ -10,7 +10,7 @@
include conf/machine/include/imx-base.inc
include conf/machine/include/tune-cortexa7.inc
-KERNEL_DEVICETREE = "igkboard-emmc.dtb"
+KERNEL_DEVICETREE = "igkboard.dtb"
UBOOT_CONFIG ??= "sd"
UBOOT_CONFIG[sd] = "igkboard_defconfig,sdcard"
diff --git a/yocto/meta-igkboard/hardknott/recipes-images/igkboard/linuxsys-image.bb b/yocto/meta-igkboard/hardknott/recipes-images/igkboard/linuxsys-image.bb
index 6bb9cc1..fda0d8e 100644
--- a/yocto/meta-igkboard/hardknott/recipes-images/igkboard/linuxsys-image.bb
+++ b/yocto/meta-igkboard/hardknott/recipes-images/igkboard/linuxsys-image.bb
@@ -9,46 +9,43 @@
## Select Image Features
IMAGE_FEATURES += " \
- ssh-server-openssh \
- package-management \
+ ssh-server-openssh \
+ package-management \
"
CORE_IMAGE_EXTRA_INSTALL += " \
- packagegroup-core-full-cmdline \
- packagegroup-tools-bluetooth \
- packagegroup-fsl-tools-audio \
- packagegroup-fsl-gstreamer1.0 \
- packagegroup-fsl-gstreamer1.0-full \
- packagegroup-qt5-imx \
- packagegroup-misc-utils \
- firmwared \
- ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'weston-init', '', d)} \
+ packagegroup-core-full-cmdline \
+ packagegroup-tools-bluetooth \
+ packagegroup-fsl-tools-audio \
+ packagegroup-fsl-gstreamer1.0 \
+ packagegroup-fsl-gstreamer1.0-full \
+ packagegroup-qt5-imx \
+ packagegroup-misc-utils \
+ firmwared \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'weston-init', '', d)} \
"
-CORE_IMAGE_EXTRA_INSTALL_append = " \
- drivers-mods \
- hello-apps \
- gnupg \
- e2fsprogs \
- e2fsprogs-resize2fs \
- parted \
- v4l-utils \
- yavta \
- sudo \
- nano \
- hostapd \
- evtest \
- mtd-utils \
- libgpiod \
- i2c-tools \
- spitools \
- spidev-test \
- canutils \
- xz \
- udev-extraconf \
+CORE_IMAGE_EXTRA_INSTALL:append = " \
+ drivers-mods hello-apps \
+ bash bash-completion nano sudo \
+ curl tree xz dnsmasq gnupg git rsync \
+ e2fsprogs e2fsprogs-resize2fs parted \
+ v4l-utils zbar yavta fbgrab imagemagick \
+ mtd-utils evtest iperf3 iotop lsof \
+ mosquitto sqlite3 stunnel \
+ i2c-tools spitools spidev-test \
+ libgpiod libgpiod-tools \
+ libevent libconfig boost ldd \
+ libmodbus libsocketcan canutils \
+ wvdial ppp hostapd ntp iw \
+ nodejs nodejs-npm tcpdump \
+ udev-extraconf usb-modeswitch \
"
inherit extrausers
+
+# generate by printf "%q\n" $(mkpasswd -m sha256crypt 12345)
+PASSWD= "\$5\$CZyCdtQE9Dp\$kuAmtCHtAv3X5gL1/imI.g1lf.JChVAEkdA3.8Yw8j8"
EXTRA_USERS_PARAMS = "\
- usermod -P 12345 root; \
+ usermod -p '${PASSWD}' root; \
"
diff --git a/yocto/meta-igkboard/hardknott/recipes-kernel/linux/linux-imx-headers_5.10.bbappend b/yocto/meta-igkboard/hardknott/recipes-kernel/linux/linux-imx-headers_5.10.bbappend
index 55051b7..4841d47 100644
--- a/yocto/meta-igkboard/hardknott/recipes-kernel/linux/linux-imx-headers_5.10.bbappend
+++ b/yocto/meta-igkboard/hardknott/recipes-kernel/linux/linux-imx-headers_5.10.bbappend
@@ -1,4 +1,4 @@
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6"
-SRCREV = "1c0116f3da250c5a52858c53efb8b38c0963f477"
+SRCREV = "a11753a89ec610768301d4070e10b8bd60fde8cd"
diff --git a/yocto/meta-igkboard/hardknott/recipes-kernel/linux/linux-imx_5.10.bbappend b/yocto/meta-igkboard/hardknott/recipes-kernel/linux/linux-imx_5.10.bbappend
index 585363d..0101b98 100644
--- a/yocto/meta-igkboard/hardknott/recipes-kernel/linux/linux-imx_5.10.bbappend
+++ b/yocto/meta-igkboard/hardknott/recipes-kernel/linux/linux-imx_5.10.bbappend
@@ -12,13 +12,9 @@
require recipes-kernel/linux/linux-yocto.inc
-SRCBRANCH = "lf-5.15.y"
-KERNEL_SRC = "git://source.codeaurora.org/external/imx/linux-imx.git;protocol=https;branch=${SRCBRANCH}"
-KBRANCH = "${SRCBRANCH}"
-SRC_URI = "${KERNEL_SRC}"
-
-# https://source.codeaurora.org/external/imx/uboot-imx/tag/?h=lf-5.10.52-2.1.0
-SRCREV = "1c0116f3da250c5a52858c53efb8b38c0963f477"
+# base: meta-imx/meta-bsp/recipes-kernel/linux/linux-imx_5.10.bb
+# https://source.codeaurora.org/external/imx/linux-imx/tag/?h=lf-5.10.52-2.1.0
+SRCREV = "a11753a89ec610768301d4070e10b8bd60fde8cd"
LOCALVERSION = "-lf-5.10.52-2.1.0"
LINUX_VERSION = "5.10.52"
--
Gitblit v1.9.1