On Thu, Jan 4, 2024 at 05:27 AM, Trevor Woerner wrote: > > On Tue 2023-12-19 @ 07:23:52 PM, Stephen Chen wrote: > >> This will add all built kernel modules to the image. >> >> Signed-off-by: Stephen Chen <step...@radxa.com> >> >> diff --git a/conf/machine/include/rock-pi-4.inc >> b/conf/machine/include/rock-pi-4.inc >> index 0a86846..fd9a9eb 100644 >> --- a/conf/machine/include/rock-pi-4.inc >> +++ b/conf/machine/include/rock-pi-4.inc >> @@ -3,4 +3,4 @@ MACHINEOVERRIDES =. "rock-pi-4:" >> >> require conf/machine/include/rk3399.inc >> >> -MACHINE_EXTRA_RRECOMMENDS += "kernel-modules" >> +MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "kernel-modules" >> diff --git a/conf/machine/nanopi-m4b.conf b/conf/machine/nanopi-m4b.conf >> index 35cd8f6..01d5c59 100644 >> --- a/conf/machine/nanopi-m4b.conf >> +++ b/conf/machine/nanopi-m4b.conf >> @@ -5,7 +5,7 @@ > > I've tried this a couple times and a couple different ways and I can't > figure > out how what we already have (MACHINE_EXTRA_RRECOMMENDS) is any different > from > what you're proposing (MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS). > > Using a very basic, no-distro setup I've built core-image-minimal and > core-image-base both with and without your patch and I see absolutely no > difference in the list of installed packages > (buildhistory/images/rock_5b/glibc/core-image-*/installed-packages.txt). > > All of meta-rockchip's machine/include/* files already include > MACHINE_EXTRA_RRECOMMENDS, do you have a scenario where a build is not > including all of the built kernel modules in an image? > > >> require conf/machine/include/rk3399.inc >> >> -MACHINE_EXTRA_RRECOMMENDS += "kernel-modules" >> +MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "kernel-modules" >> >> KERNEL_DEVICETREE = "rockchip/rk3399-nanopi-m4b.dtb" >> UBOOT_MACHINE = "nanopi-m4b-rk3399_defconfig" >> diff --git a/conf/machine/nanopi-r2s.conf b/conf/machine/nanopi-r2s.conf >> index 4472c21..4ed3160 100644 >> --- a/conf/machine/nanopi-r2s.conf >> +++ b/conf/machine/nanopi-r2s.conf >> @@ -6,6 +6,6 @@ >> require conf/machine/include/rk3328.inc >> >> KERNEL_DEVICETREE = "rockchip/rk3328-nanopi-r2s.dtb" >> -MACHINE_EXTRA_RRECOMMENDS += "kernel-modules" >> +MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "kernel-modules" >> >> UBOOT_MACHINE = "nanopi-r2s-rk3328_defconfig" >> diff --git a/conf/machine/nanopi-r4s.conf b/conf/machine/nanopi-r4s.conf >> index 21be440..1a63a96 100644 >> --- a/conf/machine/nanopi-r4s.conf >> +++ b/conf/machine/nanopi-r4s.conf >> @@ -5,7 +5,7 @@ >> >> require conf/machine/include/rk3399.inc >> >> -MACHINE_EXTRA_RRECOMMENDS += "kernel-modules" >> +MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "kernel-modules" >> >> KERNEL_DEVICETREE = "rockchip/rk3399-nanopi-r4s.dtb" >> UBOOT_MACHINE = "nanopi-r4s-rk3399_defconfig" >> diff --git a/conf/machine/rock-5a.conf b/conf/machine/rock-5a.conf >> index 5ace4da..53b56b1 100644 >> --- a/conf/machine/rock-5a.conf >> +++ b/conf/machine/rock-5a.conf >> @@ -7,6 +7,6 @@ require conf/machine/include/rk3588s.inc >> >> PREFERRED_PROVIDER_virtual/kernel = "linux-yocto-dev" >> KERNEL_DEVICETREE = "rockchip/rk3588s-rock-5a.dtb" >> -MACHINE_EXTRA_RRECOMMENDS += "kernel-modules" >> +MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "kernel-modules" >> >> UBOOT_MACHINE = "rock5a-rk3588s_defconfig" >> diff --git a/conf/machine/rock-5b.conf b/conf/machine/rock-5b.conf >> index d137108..dc5fabc 100644 >> --- a/conf/machine/rock-5b.conf >> +++ b/conf/machine/rock-5b.conf >> @@ -7,6 +7,6 @@ require conf/machine/include/rk3588.inc >> >> PREFERRED_PROVIDER_virtual/kernel = "linux-yocto-dev" >> KERNEL_DEVICETREE = "rockchip/rk3588-rock-5b.dtb" >> -MACHINE_EXTRA_RRECOMMENDS += "kernel-modules" >> +MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "kernel-modules" >> >> UBOOT_MACHINE = "rock5b-rk3588_defconfig" >> diff --git a/conf/machine/rock-pi-e.conf b/conf/machine/rock-pi-e.conf >> index 517956c..3f83675 100644 >> --- a/conf/machine/rock-pi-e.conf >> +++ b/conf/machine/rock-pi-e.conf >> @@ -6,6 +6,6 @@ >> require conf/machine/include/rk3328.inc >> >> KERNEL_DEVICETREE = "rockchip/rk3328-rock-pi-e.dtb" >> -MACHINE_EXTRA_RRECOMMENDS += "kernel-modules" >> +MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "kernel-modules" >> >> UBOOT_MACHINE = "rock-pi-e-rk3328_defconfig" >> diff --git a/conf/machine/rock-pi-s.conf b/conf/machine/rock-pi-s.conf >> index 79ea73c..590e972 100644 >> --- a/conf/machine/rock-pi-s.conf >> +++ b/conf/machine/rock-pi-s.conf >> @@ -6,6 +6,6 @@ >> require conf/machine/include/rk3308.inc >> >> KERNEL_DEVICETREE = "rockchip/rk3308-rock-pi-s.dtb" >> -MACHINE_EXTRA_RRECOMMENDS += "kernel-modules" >> +MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "kernel-modules" >> >> UBOOT_MACHINE = "rock-pi-s-rk3308_defconfig" >> -- >> 2.25.1 > >
Hi I build ROCK 5A core-image-full-cmdline. Without that patch, only these ko are included. $ tree build/tmp-glibc/work/rock_5a-oe-linux/core-image-full-cmdline/1.0/rootfs/lib/modules/6.6.0-yoctodev-standard-00098-gb053bfb06fa2/kernel/ build/tmp-glibc/work/rock_5a-oe-linux/core-image-full-cmdline/1.0/rootfs/lib/modules/6.6.0-yoctodev-standard-00098-gb053bfb06fa2/kernel/ ├── lib │ └── libcrc32c.ko └── net ├── 802 │ └── stp.ko ├── bridge │ └── bridge.ko ├── ipv4 │ └── netfilter │ ├── iptable_filter.ko │ ├── iptable_mangle.ko │ ├── iptable_nat.ko │ ├── iptable_raw.ko │ ├── iptable_security.ko │ ├── ip_tables.ko │ ├── ipt_REJECT.ko │ ├── nf_defrag_ipv4.ko │ └── nf_reject_ipv4.ko ├── ipv6 │ ├── ipv6.ko │ └── netfilter │ ├── ip6table_filter.ko │ ├── ip6table_mangle.ko │ ├── ip6table_nat.ko │ ├── ip6_tables.ko │ └── nf_defrag_ipv6.ko ├── llc │ └── llc.ko └── netfilter ├── nf_conntrack.ko ├── nf_conntrack_netlink.ko ├── nf_nat.ko ├── nfnetlink.ko ├── x_tables.ko ├── xt_addrtype.ko ├── xt_CHECKSUM.ko ├── xt_conntrack.ko ├── xt_MASQUERADE.ko ├── xt_nat.ko ├── xt_state.ko └── xt_tcpudp.ko 10 directories, 31 files With this patch, more ko are included. $ tree build/tmp-glibc/work/rock_5a-oe-linux/core-image-full-cmdline/1.0/rootfs/lib/modules/6.6.0-yoctodev-standard-00098-gb053bfb06fa2/kernel/ build/tmp-glibc/work/rock_5a-oe-linux/core-image-full-cmdline/1.0/rootfs/lib/modules/6.6.0-yoctodev-standard-00098-gb053bfb06fa2/kernel/ ├── arch │ └── arm64 │ ├── crypto │ │ ├── aes-neon-blk.ko │ │ ├── aes-neon-bs.ko │ │ ├── chacha-neon.ko │ │ ├── crct10dif-ce.ko │ │ ├── sha3-ce.ko │ │ ├── sha512-arm64.ko │ │ ├── sha512-ce.ko │ │ └── sm3-ce.ko │ └── lib │ └── xor-neon.ko ├── crypto │ │ │ ├── mc44s803.ko .... ..... └── rockchip ├── snd-soc-rk3399-gru-sound.ko ├── snd-soc-rockchip-i2s.ko ├── snd-soc-rockchip-i2s-tdm.ko ├── snd-soc-rockchip-rt5645.ko └── snd-soc-rockchip-spdif.ko 256 directories, 809 files
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#62082): https://lists.yoctoproject.org/g/yocto/message/62082 Mute This Topic: https://lists.yoctoproject.org/mt/103260773/21656 Group Owner: yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
