* [DistroKit] [PATCH 1/2] mipsel: sync kernelconfig
@ 2024-07-31 9:14 Roland Hieber
2024-07-31 9:14 ` [DistroKit] [PATCH 2/2] mipsel: remove forked host-qemu rule Roland Hieber
` (4 more replies)
0 siblings, 5 replies; 20+ messages in thread
From: Roland Hieber @ 2024-07-31 9:14 UTC (permalink / raw)
To: distrokit; +Cc: Oleksij Rempel, Roland Hieber
Part of the changes stem from the toolchain update (commit
282b31d940f79ed01352, 2024-04-22, Ladislav Michl: "mipsel: update to
OSELAS.Toolchain 2023.07.1"), other parts in the kernel-malta config
were just out of sync with the main kernelconfig. Use default values for
all prompted options.
Cc: Oleksij Rempel <o.rempel@pengutronix.de>
Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
configs/platform-mipsel/kernelconfig | 2 +-
configs/platform-mipsel/kernelconfig-malta | 15 +++++++++----
.../platform-mipsel/kernelconfig-malta.diff | 21 +++++++++++--------
3 files changed, 24 insertions(+), 14 deletions(-)
diff --git a/configs/platform-mipsel/kernelconfig b/configs/platform-mipsel/kernelconfig
index 499b7b6c1d17..176969bb7c9b 100644
--- a/configs/platform-mipsel/kernelconfig
+++ b/configs/platform-mipsel/kernelconfig
@@ -17,7 +17,7 @@ CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y
CONFIG_CC_HAS_ASM_INLINE=y
CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
-CONFIG_PAHOLE_VERSION=0
+CONFIG_PAHOLE_VERSION=124
CONFIG_IRQ_WORK=y
CONFIG_BUILDTIME_TABLE_SORT=y
diff --git a/configs/platform-mipsel/kernelconfig-malta b/configs/platform-mipsel/kernelconfig-malta
index 35d3219ab371..6f73c6047892 100644
--- a/configs/platform-mipsel/kernelconfig-malta
+++ b/configs/platform-mipsel/kernelconfig-malta
@@ -2,9 +2,9 @@
# Automatically generated file; DO NOT EDIT.
# Linux/mips 6.4.10 Kernel Configuration
#
-CONFIG_CC_VERSION_TEXT="mipsel-softfloat-linux-gnu-gcc (OSELAS.Toolchain-2023.07.0 13-20230624) 13.1.1 20230624"
+CONFIG_CC_VERSION_TEXT="mipsel-softfloat-linux-gnu-gcc (OSELAS.Toolchain-2023.07.1 13-20231118) 13.2.1 20231118"
CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=130101
+CONFIG_GCC_VERSION=130201
CONFIG_CLANG_VERSION=0
CONFIG_AS_IS_GNU=y
CONFIG_AS_VERSION=24000
@@ -1450,6 +1450,7 @@ CONFIG_BLK_DEV=y
# CONFIG_BLK_DEV_NULL_BLK is not set
# CONFIG_BLK_DEV_FD is not set
# CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set
+# CONFIG_ZRAM is not set
CONFIG_BLK_DEV_LOOP=m
CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
# CONFIG_BLK_DEV_DRBD is not set
@@ -3500,11 +3501,11 @@ CONFIG_CRYPTO_CRC32C=y
# Compression
#
CONFIG_CRYPTO_DEFLATE=m
-# CONFIG_CRYPTO_LZO is not set
+CONFIG_CRYPTO_LZO=y
# CONFIG_CRYPTO_842 is not set
# CONFIG_CRYPTO_LZ4 is not set
# CONFIG_CRYPTO_LZ4HC is not set
-# CONFIG_CRYPTO_ZSTD is not set
+CONFIG_CRYPTO_ZSTD=y
# end of Compression
#
@@ -3621,9 +3622,15 @@ CONFIG_CRC32_SLICEBY8=y
# CONFIG_CRC7 is not set
CONFIG_LIBCRC32C=m
# CONFIG_CRC8 is not set
+CONFIG_XXHASH=y
# CONFIG_RANDOM32_SELFTEST is not set
CONFIG_ZLIB_INFLATE=m
CONFIG_ZLIB_DEFLATE=m
+CONFIG_LZO_COMPRESS=y
+CONFIG_LZO_DECOMPRESS=y
+CONFIG_ZSTD_COMMON=y
+CONFIG_ZSTD_COMPRESS=y
+CONFIG_ZSTD_DECOMPRESS=y
# CONFIG_XZ_DEC is not set
CONFIG_GENERIC_ALLOCATOR=y
CONFIG_TEXTSEARCH=y
diff --git a/configs/platform-mipsel/kernelconfig-malta.diff b/configs/platform-mipsel/kernelconfig-malta.diff
index 941646631905..032020ae876a 100644
--- a/configs/platform-mipsel/kernelconfig-malta.diff
+++ b/configs/platform-mipsel/kernelconfig-malta.diff
@@ -1,4 +1,4 @@
-bb72d3559ad286bbed584fb7dce43ed7
+2b532330125b9ad63586ebb2fff9745a
# CONFIG_8139CP is not set
# CONFIG_8139TOO is not set
# CONFIG_ACENIC is not set
@@ -84,10 +84,10 @@ CONFIG_BLK_DEV_BSG=y
CONFIG_BLK_DEV_BSGLIB=y
CONFIG_BLK_DEV_BSG_COMMON=y
CONFIG_BLK_DEV_DM=m
-# CONFIG_BLK_DEV_FD is not set
CONFIG_BLK_DEV_LOOP=m
CONFIG_BLK_DEV_MD=m
# CONFIG_BLK_DEV_NVME is not set
+# CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set
CONFIG_BLK_DEV_SD=y
# CONFIG_BLK_DEV_SR is not set
CONFIG_BLK_MQ_PCI=y
@@ -160,7 +160,6 @@ CONFIG_CRC32_SLICEBY8=y
# CONFIG_CRC_CCITT is not set
CONFIG_CRC_ITU_T=m
CONFIG_CROSS_MEMORY_ATTACH=y
-CONFIG_CRYPTO_ACOMP2=y
CONFIG_CRYPTO_AEAD2=y
CONFIG_CRYPTO_AEAD=m
CONFIG_CRYPTO_AES=m
@@ -207,7 +206,6 @@ CONFIG_CRYPTO_ESSIV=m
CONFIG_CRYPTO_FCRYPT=m
CONFIG_CRYPTO_GCM=m
CONFIG_CRYPTO_GHASH=m
-CONFIG_CRYPTO_HASH_INFO=y
CONFIG_CRYPTO_HMAC=y
CONFIG_CRYPTO_HW=y
CONFIG_CRYPTO_JITTERENTROPY=m
@@ -830,11 +828,7 @@ CONFIG_MTD_OOPS=m
# CONFIG_MTD_PHYSMAP_VERSATILE is undefined
# CONFIG_MTD_PMC551 is not set
CONFIG_MTD_UBI=m
-CONFIG_MTD_UBI_BEB_LIMIT=20
-# CONFIG_MTD_UBI_BLOCK is not set
-# CONFIG_MTD_UBI_FASTMAP is not set
CONFIG_MTD_UBI_GLUEBI=m
-CONFIG_MTD_UBI_WL_THRESHOLD=4096
CONFIG_MULTIPLEXER=y
# CONFIG_MUX_ADG792A is not set
# CONFIG_MUX_MMIO is not set
@@ -1116,6 +1110,7 @@ CONFIG_OF_MDIO=m
CONFIG_PAGE_POOL_STATS=y
CONFIG_PAGE_SIZE_16KB=y
# CONFIG_PAGE_SIZE_4KB is not set
+CONFIG_PAHOLE_VERSION=124
# CONFIG_PANIC_ON_OOPS is not set
CONFIG_PANIC_ON_OOPS_VALUE=0
CONFIG_PANIC_TIMEOUT=0
@@ -1523,7 +1518,6 @@ CONFIG_SERIO_SERPORT=y
# CONFIG_SFP is undefined
CONFIG_SGETMASK_SYSCALL=y
# CONFIG_SGI_PARTITION is undefined
-CONFIG_SGL_ALLOC=y
CONFIG_SG_POOL=y
# CONFIG_SIS190 is not set
# CONFIG_SIS900 is not set
@@ -1602,6 +1596,15 @@ CONFIG_TEXTSEARCH_KMP=m
# CONFIG_TPS65010 is undefined
CONFIG_TUN=m
# CONFIG_TXGBE is not set
+# CONFIG_UBIFS_ATIME_SUPPORT is undefined
+# CONFIG_UBIFS_FS is undefined
+# CONFIG_UBIFS_FS_ADVANCED_COMPR is undefined
+# CONFIG_UBIFS_FS_AUTHENTICATION is undefined
+# CONFIG_UBIFS_FS_LZO is undefined
+# CONFIG_UBIFS_FS_SECURITY is undefined
+# CONFIG_UBIFS_FS_XATTR is undefined
+# CONFIG_UBIFS_FS_ZLIB is undefined
+# CONFIG_UBIFS_FS_ZSTD is undefined
# CONFIG_UEVENT_HELPER is not set
# CONFIG_UEVENT_HELPER_PATH is undefined
# CONFIG_UFS_FS is undefined
--
2.39.2
^ permalink raw reply [flat|nested] 20+ messages in thread
* [DistroKit] [PATCH 2/2] mipsel: remove forked host-qemu rule
2024-07-31 9:14 [DistroKit] [PATCH 1/2] mipsel: sync kernelconfig Roland Hieber
@ 2024-07-31 9:14 ` Roland Hieber
2024-07-31 11:42 ` [DistroKit] [PATCH 1/2] mipsel: sync kernelconfig Robert Schwebel
` (3 subsequent siblings)
4 siblings, 0 replies; 20+ messages in thread
From: Roland Hieber @ 2024-07-31 9:14 UTC (permalink / raw)
To: distrokit; +Cc: Roland Hieber
This rule was forked in commit eaf7839876093a6c34f8 (2021-07-08, Oleksij
Rempel: "platform-mipsel: add basic qemu malta support"), which has been
merged upstream in PTXdist 2023.11.0. As we are currently using PTXdist
2024.05.0, remove our outdated fork.
Link: https://git.pengutronix.de/cgit/ptxdist/commit/?h=572e3440d6f8206e949c
Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
configs/platform-mipsel/rules/host-qemu.make | 244 -------------------
1 file changed, 244 deletions(-)
delete mode 100644 configs/platform-mipsel/rules/host-qemu.make
diff --git a/configs/platform-mipsel/rules/host-qemu.make b/configs/platform-mipsel/rules/host-qemu.make
deleted file mode 100644
index 8d377ffa55f8..000000000000
--- a/configs/platform-mipsel/rules/host-qemu.make
+++ /dev/null
@@ -1,244 +0,0 @@
-# -*-makefile-*-
-#
-# Copyright (C) 2012 by Bernhard Walle <bernhard@bwalle.de>
-# (C) 2013 by Michael Olbrich <m.olbrich@pengutronix.de>
-# (C) 2013 by Jan Luebbe <j.luebbe@pengutronix.de>
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-HOST_PACKAGES-$(PTXCONF_HOST_QEMU) += host-qemu
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-#
-# autoconf
-#
-
-HOST_QEMU_BROKEN_ICECC := \
- $(call ptx/sh, gcc -dumpversion | awk -F . '{ if ($$1*100 + $$2 < 409) print "y" }')
-
-ifeq ($(HOST_QEMU_BROKEN_ICECC),y)
-HOST_QEMU_MAKE_ENV := PTXDIST_ICECC=$(PTXDIST_ICERUN)
-endif
-HOST_QEMU_MAKE_OPT := V=$(filter 1,$(PTXDIST_VERBOSE))
-
-HOST_QEMU_TARGETS := $(PTXCONF_ARCH_STRING)
-ifndef PTXCONF_ARCH_X86_64
-ifdef PTXCONF_ARCH_X86
-HOST_QEMU_TARGETS := i386
-endif
-endif
-ifdef PTXCONF_ARCH_ARM64
-HOST_QEMU_TARGETS := aarch64
-endif
-ifdef PTXCONF_ARCH_MIPS
-ifdef PTXCONF_ENDIAN_LITTLE
-HOST_QEMU_TARGETS := mipsel
-endif
-endif
-HOST_QEMU_SYS_TARGETS := $(patsubst %,%-softmmu,$(HOST_QEMU_TARGETS))
-HOST_QEMU_USR_TARGETS := $(patsubst %,%-linux-user,$(HOST_QEMU_TARGETS))
-
-HOST_QEMU_CONF_TOOL := autoconf
-# Note: not really autoconf:
-# e.g. there is --enable-debug but not --disable-debug
-HOST_QEMU_CONF_OPT := \
- --prefix=/usr \
- --target-list=" \
- $(call ptx/ifdef, PTXCONF_HOST_QEMU_SYS,$(HOST_QEMU_SYS_TARGETS),) \
- $(call ptx/ifdef, PTXCONF_HOST_QEMU_USR,$(HOST_QEMU_USR_TARGETS),) \
- " \
- --ninja=ninja \
- --disable-download \
- --disable-sanitizers \
- --disable-tsan \
- --disable-werror \
- --enable-stack-protector \
- --with-coroutine=auto \
- --disable-plugins \
- --disable-containers \
- --audio-drv-list= \
- --block-drv-ro-whitelist= \
- --block-drv-rw-whitelist= \
- --enable-coroutine-pool \
- --disable-cfi \
- --disable-debug-mutex \
- --enable-fdt \
- --disable-fuzzing \
- --disable-lto \
- --disable-module-upgrades \
- --disable-qom-cast-debug \
- --disable-rng-none \
- --disable-strip \
- --disable-tcg-interpreter \
- --enable-trace-backends=nop \
- --tls-priority=NORMAL \
- --disable-alsa \
- --enable-attr \
- --disable-auth-pam \
- --disable-blkio \
- --disable-bochs \
- --disable-bpf \
- --disable-brlapi \
- --disable-bzip2 \
- --disable-canokey \
- --enable-cap-ng \
- --disable-capstone \
- --disable-cloop \
- --disable-cocoa \
- --disable-coreaudio \
- --disable-crypto-afalg \
- --disable-curl \
- --disable-curses \
- --disable-dmg \
- --disable-docs \
- --disable-dsound \
- --disable-fuse \
- --disable-fuse-lseek \
- --disable-gcrypt \
- --disable-gettext \
- --disable-gio \
- --disable-glusterfs \
- --disable-gnutls \
- --disable-gtk \
- --disable-gtk-clipboard \
- --disable-guest-agent \
- --disable-guest-agent-msi \
- --disable-hax \
- --disable-hvf \
- --enable-iconv \
- --disable-jack \
- --disable-keyring \
- --enable-kvm \
- --disable-l2tpv3 \
- --disable-libdaxctl \
- --disable-libdw \
- --disable-libiscsi \
- --disable-libnfs \
- --disable-libpmem \
- --disable-libssh \
- --disable-libudev \
- --$(call ptx/endis, PTXCONF_HOST_QEMU_SYS)-libusb \
- --disable-libvduse \
- --disable-linux-aio \
- --disable-linux-io-uring \
- --disable-live-block-migration \
- --disable-lzfse \
- --disable-lzo \
- --enable-malloc-trim \
- --enable-membarrier \
- --disable-mpath \
- --enable-multiprocess \
- --disable-netmap \
- --disable-nettle \
- --disable-numa \
- --disable-nvmm \
- --disable-opengl \
- --disable-oss \
- --disable-pa \
- --disable-pipewire \
- --disable-parallels \
- --disable-png \
- --disable-pvrdma \
- --disable-qcow1 \
- --disable-qed \
- --disable-qga-vss \
- --disable-rbd \
- --disable-rdma \
- --disable-replication \
- --disable-sdl \
- --disable-sdl-image \
- --disable-seccomp \
- --disable-selinux \
- --enable-slirp \
- --disable-slirp-smbd \
- --disable-smartcard \
- --disable-snappy \
- --disable-sndio \
- --disable-sparse \
- --disable-spice \
- --disable-spice-protocol \
- --enable-tcg \
- --disable-tools \
- --disable-tpm \
- --disable-u2f \
- --disable-usb-redir \
- --disable-vdi \
- --disable-vduse-blk-export \
- --disable-vfio-user-server \
- --disable-vhost-crypto \
- --enable-vhost-kernel \
- --enable-vhost-net \
- --disable-vhost-user \
- --disable-vhost-user-blk-server \
- --disable-vhost-vdpa \
- --disable-virglrenderer \
- --$(call ptx/endis, PTXCONF_HOST_QEMU_SYS)-virtfs \
- --disable-vmnet \
- --disable-vnc \
- --disable-vnc-jpeg \
- --disable-vnc-sasl \
- --disable-vte \
- --disable-vvfat \
- --disable-whpx \
- --disable-xen \
- --disable-xen-pci-passthrough \
- --disable-xkbcommon \
- --disable-zstd \
- --$(call ptx/endis, PTXCONF_HOST_QEMU_SYS)-system \
- --disable-user \
- --$(call ptx/endis, PTXCONF_HOST_QEMU_USR)-linux-user \
- --disable-bsd-user \
- --enable-pie \
- --disable-modules \
- --disable-debug-tcg \
- --disable-debug-info \
- --disable-safe-stack
-
-# Use '=' to delay $(shell ...) calls until this is needed
-QEMU_CROSS_QEMU = $(call ptx/get-alternative, config/qemu, qemu-cross)
-QEMU_CROSS_DL = $(shell ptxd_cross_cc_v | sed -n -e 's/.* -dynamic-linker \([^ ]*\).*/\1/p')
-QEMU_CROSS_TOOLEXECLIBDIR = $(shell dirname $$(realpath $$(ptxd_cross_cc -print-file-name=libatomic.so 2> /dev/null)))
-QEMU_CROSS_LD_LIBRARY_PATH = $(PTXDIST_SYSROOT_TOOLCHAIN)/lib:$(QEMU_CROSS_TOOLEXECLIBDIR):$(SYSROOT)/lib:$(SYSROOT)/usr/lib
-
-QEMU_CROSS_QEMU_ENV = \
- QEMU="$(PTXDIST_SYSROOT_HOST)/usr/bin/qemu-$(HOST_QEMU_TARGETS)" \
- KERNEL_VERSION="$(KERNEL_VERSION)" \
- QEMU_LD_PREFIX="$(PTXDIST_SYSROOT_TOOLCHAIN)" \
- QEMU_LD_LIBRARY_PATH="$(QEMU_CROSS_LD_LIBRARY_PATH)" \
- LINKER="$(shell readlink -f "$$(ptxd_cross_cc -print-file-name=$$(ptxd_get_dl))")"
-
-$(STATEDIR)/host-qemu.install:
- @$(call targetinfo)
- @$(call world/install, HOST_QEMU)
-ifdef PTXCONF_HOST_QEMU_SYS
-# # necessary for qemu to find its ROM files
- @ln -vsf share/qemu $(HOST_QEMU_PKGDIR)/usr/pc-bios
-endif
- @$(call touch)
-
-$(STATEDIR)/host-qemu.install.post:
- @$(call targetinfo)
- @$(call world/install.post, HOST_QEMU)
-ifdef PTXCONF_HOST_QEMU_USR
- @$(QEMU_CROSS_QEMU_ENV) ptxd_replace_magic $(QEMU_CROSS_QEMU) > $(PTXDIST_SYSROOT_CROSS)/usr/bin/qemu-cross
- @chmod +x $(PTXDIST_SYSROOT_CROSS)/usr/bin/qemu-cross
- @install -d -m 755 $(PTXDIST_SYSROOT_CROSS)/usr/bin/qemu/
- @sed \
- -e 's|RTLDLIST=.*|RTLDLIST="$(PTXDIST_SYSROOT_TOOLCHAIN)$(QEMU_CROSS_DL)"|' \
- -e 's|eval $$add_env|eval $(PTXDIST_SYSROOT_CROSS)/usr/bin/qemu-cross -E "$${add_env// /,}"|' \
- -e 's|verify_out=`|verify_out=`$(PTXDIST_SYSROOT_CROSS)/usr/bin/qemu-cross |' \
- -e 's|#! */.*$$|#!$(shell readlink $(PTXDIST_TOPDIR)/bin/bash)|' \
- $(PTXDIST_SYSROOT_TOOLCHAIN)/usr/bin/ldd > $(PTXDIST_SYSROOT_CROSS)/usr/bin/qemu/ldd
- @chmod +x $(PTXDIST_SYSROOT_CROSS)/usr/bin/qemu/ldd
-endif
- @$(call touch)
-
-# vim: syntax=make
--
2.39.2
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [DistroKit] [PATCH 1/2] mipsel: sync kernelconfig
2024-07-31 9:14 [DistroKit] [PATCH 1/2] mipsel: sync kernelconfig Roland Hieber
2024-07-31 9:14 ` [DistroKit] [PATCH 2/2] mipsel: remove forked host-qemu rule Roland Hieber
@ 2024-07-31 11:42 ` Robert Schwebel
2024-07-31 12:07 ` Alexander Dahl
` (2 subsequent siblings)
4 siblings, 0 replies; 20+ messages in thread
From: Robert Schwebel @ 2024-07-31 11:42 UTC (permalink / raw)
To: Roland Hieber; +Cc: Oleksij Rempel, distrokit
Applied to next
On Wed, Jul 31, 2024 at 11:14:34AM +0200, Roland Hieber wrote:
> Part of the changes stem from the toolchain update (commit
> 282b31d940f79ed01352, 2024-04-22, Ladislav Michl: "mipsel: update to
> OSELAS.Toolchain 2023.07.1"), other parts in the kernel-malta config
> were just out of sync with the main kernelconfig. Use default values for
> all prompted options.
>
> Cc: Oleksij Rempel <o.rempel@pengutronix.de>
> Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> ---
> configs/platform-mipsel/kernelconfig | 2 +-
> configs/platform-mipsel/kernelconfig-malta | 15 +++++++++----
> .../platform-mipsel/kernelconfig-malta.diff | 21 +++++++++++--------
> 3 files changed, 24 insertions(+), 14 deletions(-)
>
> diff --git a/configs/platform-mipsel/kernelconfig b/configs/platform-mipsel/kernelconfig
> index 499b7b6c1d17..176969bb7c9b 100644
> --- a/configs/platform-mipsel/kernelconfig
> +++ b/configs/platform-mipsel/kernelconfig
> @@ -17,7 +17,7 @@ CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
> CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y
> CONFIG_CC_HAS_ASM_INLINE=y
> CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
> -CONFIG_PAHOLE_VERSION=0
> +CONFIG_PAHOLE_VERSION=124
> CONFIG_IRQ_WORK=y
> CONFIG_BUILDTIME_TABLE_SORT=y
>
> diff --git a/configs/platform-mipsel/kernelconfig-malta b/configs/platform-mipsel/kernelconfig-malta
> index 35d3219ab371..6f73c6047892 100644
> --- a/configs/platform-mipsel/kernelconfig-malta
> +++ b/configs/platform-mipsel/kernelconfig-malta
> @@ -2,9 +2,9 @@
> # Automatically generated file; DO NOT EDIT.
> # Linux/mips 6.4.10 Kernel Configuration
> #
> -CONFIG_CC_VERSION_TEXT="mipsel-softfloat-linux-gnu-gcc (OSELAS.Toolchain-2023.07.0 13-20230624) 13.1.1 20230624"
> +CONFIG_CC_VERSION_TEXT="mipsel-softfloat-linux-gnu-gcc (OSELAS.Toolchain-2023.07.1 13-20231118) 13.2.1 20231118"
> CONFIG_CC_IS_GCC=y
> -CONFIG_GCC_VERSION=130101
> +CONFIG_GCC_VERSION=130201
> CONFIG_CLANG_VERSION=0
> CONFIG_AS_IS_GNU=y
> CONFIG_AS_VERSION=24000
> @@ -1450,6 +1450,7 @@ CONFIG_BLK_DEV=y
> # CONFIG_BLK_DEV_NULL_BLK is not set
> # CONFIG_BLK_DEV_FD is not set
> # CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set
> +# CONFIG_ZRAM is not set
> CONFIG_BLK_DEV_LOOP=m
> CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
> # CONFIG_BLK_DEV_DRBD is not set
> @@ -3500,11 +3501,11 @@ CONFIG_CRYPTO_CRC32C=y
> # Compression
> #
> CONFIG_CRYPTO_DEFLATE=m
> -# CONFIG_CRYPTO_LZO is not set
> +CONFIG_CRYPTO_LZO=y
> # CONFIG_CRYPTO_842 is not set
> # CONFIG_CRYPTO_LZ4 is not set
> # CONFIG_CRYPTO_LZ4HC is not set
> -# CONFIG_CRYPTO_ZSTD is not set
> +CONFIG_CRYPTO_ZSTD=y
> # end of Compression
>
> #
> @@ -3621,9 +3622,15 @@ CONFIG_CRC32_SLICEBY8=y
> # CONFIG_CRC7 is not set
> CONFIG_LIBCRC32C=m
> # CONFIG_CRC8 is not set
> +CONFIG_XXHASH=y
> # CONFIG_RANDOM32_SELFTEST is not set
> CONFIG_ZLIB_INFLATE=m
> CONFIG_ZLIB_DEFLATE=m
> +CONFIG_LZO_COMPRESS=y
> +CONFIG_LZO_DECOMPRESS=y
> +CONFIG_ZSTD_COMMON=y
> +CONFIG_ZSTD_COMPRESS=y
> +CONFIG_ZSTD_DECOMPRESS=y
> # CONFIG_XZ_DEC is not set
> CONFIG_GENERIC_ALLOCATOR=y
> CONFIG_TEXTSEARCH=y
> diff --git a/configs/platform-mipsel/kernelconfig-malta.diff b/configs/platform-mipsel/kernelconfig-malta.diff
> index 941646631905..032020ae876a 100644
> --- a/configs/platform-mipsel/kernelconfig-malta.diff
> +++ b/configs/platform-mipsel/kernelconfig-malta.diff
> @@ -1,4 +1,4 @@
> -bb72d3559ad286bbed584fb7dce43ed7
> +2b532330125b9ad63586ebb2fff9745a
> # CONFIG_8139CP is not set
> # CONFIG_8139TOO is not set
> # CONFIG_ACENIC is not set
> @@ -84,10 +84,10 @@ CONFIG_BLK_DEV_BSG=y
> CONFIG_BLK_DEV_BSGLIB=y
> CONFIG_BLK_DEV_BSG_COMMON=y
> CONFIG_BLK_DEV_DM=m
> -# CONFIG_BLK_DEV_FD is not set
> CONFIG_BLK_DEV_LOOP=m
> CONFIG_BLK_DEV_MD=m
> # CONFIG_BLK_DEV_NVME is not set
> +# CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set
> CONFIG_BLK_DEV_SD=y
> # CONFIG_BLK_DEV_SR is not set
> CONFIG_BLK_MQ_PCI=y
> @@ -160,7 +160,6 @@ CONFIG_CRC32_SLICEBY8=y
> # CONFIG_CRC_CCITT is not set
> CONFIG_CRC_ITU_T=m
> CONFIG_CROSS_MEMORY_ATTACH=y
> -CONFIG_CRYPTO_ACOMP2=y
> CONFIG_CRYPTO_AEAD2=y
> CONFIG_CRYPTO_AEAD=m
> CONFIG_CRYPTO_AES=m
> @@ -207,7 +206,6 @@ CONFIG_CRYPTO_ESSIV=m
> CONFIG_CRYPTO_FCRYPT=m
> CONFIG_CRYPTO_GCM=m
> CONFIG_CRYPTO_GHASH=m
> -CONFIG_CRYPTO_HASH_INFO=y
> CONFIG_CRYPTO_HMAC=y
> CONFIG_CRYPTO_HW=y
> CONFIG_CRYPTO_JITTERENTROPY=m
> @@ -830,11 +828,7 @@ CONFIG_MTD_OOPS=m
> # CONFIG_MTD_PHYSMAP_VERSATILE is undefined
> # CONFIG_MTD_PMC551 is not set
> CONFIG_MTD_UBI=m
> -CONFIG_MTD_UBI_BEB_LIMIT=20
> -# CONFIG_MTD_UBI_BLOCK is not set
> -# CONFIG_MTD_UBI_FASTMAP is not set
> CONFIG_MTD_UBI_GLUEBI=m
> -CONFIG_MTD_UBI_WL_THRESHOLD=4096
> CONFIG_MULTIPLEXER=y
> # CONFIG_MUX_ADG792A is not set
> # CONFIG_MUX_MMIO is not set
> @@ -1116,6 +1110,7 @@ CONFIG_OF_MDIO=m
> CONFIG_PAGE_POOL_STATS=y
> CONFIG_PAGE_SIZE_16KB=y
> # CONFIG_PAGE_SIZE_4KB is not set
> +CONFIG_PAHOLE_VERSION=124
> # CONFIG_PANIC_ON_OOPS is not set
> CONFIG_PANIC_ON_OOPS_VALUE=0
> CONFIG_PANIC_TIMEOUT=0
> @@ -1523,7 +1518,6 @@ CONFIG_SERIO_SERPORT=y
> # CONFIG_SFP is undefined
> CONFIG_SGETMASK_SYSCALL=y
> # CONFIG_SGI_PARTITION is undefined
> -CONFIG_SGL_ALLOC=y
> CONFIG_SG_POOL=y
> # CONFIG_SIS190 is not set
> # CONFIG_SIS900 is not set
> @@ -1602,6 +1596,15 @@ CONFIG_TEXTSEARCH_KMP=m
> # CONFIG_TPS65010 is undefined
> CONFIG_TUN=m
> # CONFIG_TXGBE is not set
> +# CONFIG_UBIFS_ATIME_SUPPORT is undefined
> +# CONFIG_UBIFS_FS is undefined
> +# CONFIG_UBIFS_FS_ADVANCED_COMPR is undefined
> +# CONFIG_UBIFS_FS_AUTHENTICATION is undefined
> +# CONFIG_UBIFS_FS_LZO is undefined
> +# CONFIG_UBIFS_FS_SECURITY is undefined
> +# CONFIG_UBIFS_FS_XATTR is undefined
> +# CONFIG_UBIFS_FS_ZLIB is undefined
> +# CONFIG_UBIFS_FS_ZSTD is undefined
> # CONFIG_UEVENT_HELPER is not set
> # CONFIG_UEVENT_HELPER_PATH is undefined
> # CONFIG_UFS_FS is undefined
> --
> 2.39.2
>
>
>
--
Pengutronix e.K. | Dipl.-Ing. Robert Schwebel |
Steuerwalder Str. 21 | https://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-9 |
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [DistroKit] [PATCH 1/2] mipsel: sync kernelconfig
2024-07-31 9:14 [DistroKit] [PATCH 1/2] mipsel: sync kernelconfig Roland Hieber
2024-07-31 9:14 ` [DistroKit] [PATCH 2/2] mipsel: remove forked host-qemu rule Roland Hieber
2024-07-31 11:42 ` [DistroKit] [PATCH 1/2] mipsel: sync kernelconfig Robert Schwebel
@ 2024-07-31 12:07 ` Alexander Dahl
2024-07-31 12:10 ` Michael Olbrich
2024-08-08 12:28 ` [DistroKit] [PATCH v2 01/10] mipsel: remove forked host-qemu rule Roland Hieber
4 siblings, 0 replies; 20+ messages in thread
From: Alexander Dahl @ 2024-07-31 12:07 UTC (permalink / raw)
To: Roland Hieber; +Cc: Oleksij Rempel, distrokit
Hello Roland,
Am Wed, Jul 31, 2024 at 11:14:34AM +0200 schrieb Roland Hieber:
> Part of the changes stem from the toolchain update (commit
> 282b31d940f79ed01352, 2024-04-22, Ladislav Michl: "mipsel: update to
> OSELAS.Toolchain 2023.07.1"), other parts in the kernel-malta config
> were just out of sync with the main kernelconfig. Use default values for
> all prompted options.
>
> Cc: Oleksij Rempel <o.rempel@pengutronix.de>
> Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> ---
> configs/platform-mipsel/kernelconfig | 2 +-
> configs/platform-mipsel/kernelconfig-malta | 15 +++++++++----
> .../platform-mipsel/kernelconfig-malta.diff | 21 +++++++++++--------
> 3 files changed, 24 insertions(+), 14 deletions(-)
>
> diff --git a/configs/platform-mipsel/kernelconfig b/configs/platform-mipsel/kernelconfig
> index 499b7b6c1d17..176969bb7c9b 100644
> --- a/configs/platform-mipsel/kernelconfig
> +++ b/configs/platform-mipsel/kernelconfig
> @@ -17,7 +17,7 @@ CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
> CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y
> CONFIG_CC_HAS_ASM_INLINE=y
> CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
> -CONFIG_PAHOLE_VERSION=0
> +CONFIG_PAHOLE_VERSION=124
> CONFIG_IRQ_WORK=y
> CONFIG_BUILDTIME_TABLE_SORT=y
This should not have changed since ptxdist-2021.11.0-38-g0c0cec228.
Maybe configs/platform-mipsel/rules/kernel*.make are outdated?
Greets
Alex
>
> diff --git a/configs/platform-mipsel/kernelconfig-malta b/configs/platform-mipsel/kernelconfig-malta
> index 35d3219ab371..6f73c6047892 100644
> --- a/configs/platform-mipsel/kernelconfig-malta
> +++ b/configs/platform-mipsel/kernelconfig-malta
> @@ -2,9 +2,9 @@
> # Automatically generated file; DO NOT EDIT.
> # Linux/mips 6.4.10 Kernel Configuration
> #
> -CONFIG_CC_VERSION_TEXT="mipsel-softfloat-linux-gnu-gcc (OSELAS.Toolchain-2023.07.0 13-20230624) 13.1.1 20230624"
> +CONFIG_CC_VERSION_TEXT="mipsel-softfloat-linux-gnu-gcc (OSELAS.Toolchain-2023.07.1 13-20231118) 13.2.1 20231118"
> CONFIG_CC_IS_GCC=y
> -CONFIG_GCC_VERSION=130101
> +CONFIG_GCC_VERSION=130201
> CONFIG_CLANG_VERSION=0
> CONFIG_AS_IS_GNU=y
> CONFIG_AS_VERSION=24000
> @@ -1450,6 +1450,7 @@ CONFIG_BLK_DEV=y
> # CONFIG_BLK_DEV_NULL_BLK is not set
> # CONFIG_BLK_DEV_FD is not set
> # CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set
> +# CONFIG_ZRAM is not set
> CONFIG_BLK_DEV_LOOP=m
> CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
> # CONFIG_BLK_DEV_DRBD is not set
> @@ -3500,11 +3501,11 @@ CONFIG_CRYPTO_CRC32C=y
> # Compression
> #
> CONFIG_CRYPTO_DEFLATE=m
> -# CONFIG_CRYPTO_LZO is not set
> +CONFIG_CRYPTO_LZO=y
> # CONFIG_CRYPTO_842 is not set
> # CONFIG_CRYPTO_LZ4 is not set
> # CONFIG_CRYPTO_LZ4HC is not set
> -# CONFIG_CRYPTO_ZSTD is not set
> +CONFIG_CRYPTO_ZSTD=y
> # end of Compression
>
> #
> @@ -3621,9 +3622,15 @@ CONFIG_CRC32_SLICEBY8=y
> # CONFIG_CRC7 is not set
> CONFIG_LIBCRC32C=m
> # CONFIG_CRC8 is not set
> +CONFIG_XXHASH=y
> # CONFIG_RANDOM32_SELFTEST is not set
> CONFIG_ZLIB_INFLATE=m
> CONFIG_ZLIB_DEFLATE=m
> +CONFIG_LZO_COMPRESS=y
> +CONFIG_LZO_DECOMPRESS=y
> +CONFIG_ZSTD_COMMON=y
> +CONFIG_ZSTD_COMPRESS=y
> +CONFIG_ZSTD_DECOMPRESS=y
> # CONFIG_XZ_DEC is not set
> CONFIG_GENERIC_ALLOCATOR=y
> CONFIG_TEXTSEARCH=y
> diff --git a/configs/platform-mipsel/kernelconfig-malta.diff b/configs/platform-mipsel/kernelconfig-malta.diff
> index 941646631905..032020ae876a 100644
> --- a/configs/platform-mipsel/kernelconfig-malta.diff
> +++ b/configs/platform-mipsel/kernelconfig-malta.diff
> @@ -1,4 +1,4 @@
> -bb72d3559ad286bbed584fb7dce43ed7
> +2b532330125b9ad63586ebb2fff9745a
> # CONFIG_8139CP is not set
> # CONFIG_8139TOO is not set
> # CONFIG_ACENIC is not set
> @@ -84,10 +84,10 @@ CONFIG_BLK_DEV_BSG=y
> CONFIG_BLK_DEV_BSGLIB=y
> CONFIG_BLK_DEV_BSG_COMMON=y
> CONFIG_BLK_DEV_DM=m
> -# CONFIG_BLK_DEV_FD is not set
> CONFIG_BLK_DEV_LOOP=m
> CONFIG_BLK_DEV_MD=m
> # CONFIG_BLK_DEV_NVME is not set
> +# CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set
> CONFIG_BLK_DEV_SD=y
> # CONFIG_BLK_DEV_SR is not set
> CONFIG_BLK_MQ_PCI=y
> @@ -160,7 +160,6 @@ CONFIG_CRC32_SLICEBY8=y
> # CONFIG_CRC_CCITT is not set
> CONFIG_CRC_ITU_T=m
> CONFIG_CROSS_MEMORY_ATTACH=y
> -CONFIG_CRYPTO_ACOMP2=y
> CONFIG_CRYPTO_AEAD2=y
> CONFIG_CRYPTO_AEAD=m
> CONFIG_CRYPTO_AES=m
> @@ -207,7 +206,6 @@ CONFIG_CRYPTO_ESSIV=m
> CONFIG_CRYPTO_FCRYPT=m
> CONFIG_CRYPTO_GCM=m
> CONFIG_CRYPTO_GHASH=m
> -CONFIG_CRYPTO_HASH_INFO=y
> CONFIG_CRYPTO_HMAC=y
> CONFIG_CRYPTO_HW=y
> CONFIG_CRYPTO_JITTERENTROPY=m
> @@ -830,11 +828,7 @@ CONFIG_MTD_OOPS=m
> # CONFIG_MTD_PHYSMAP_VERSATILE is undefined
> # CONFIG_MTD_PMC551 is not set
> CONFIG_MTD_UBI=m
> -CONFIG_MTD_UBI_BEB_LIMIT=20
> -# CONFIG_MTD_UBI_BLOCK is not set
> -# CONFIG_MTD_UBI_FASTMAP is not set
> CONFIG_MTD_UBI_GLUEBI=m
> -CONFIG_MTD_UBI_WL_THRESHOLD=4096
> CONFIG_MULTIPLEXER=y
> # CONFIG_MUX_ADG792A is not set
> # CONFIG_MUX_MMIO is not set
> @@ -1116,6 +1110,7 @@ CONFIG_OF_MDIO=m
> CONFIG_PAGE_POOL_STATS=y
> CONFIG_PAGE_SIZE_16KB=y
> # CONFIG_PAGE_SIZE_4KB is not set
> +CONFIG_PAHOLE_VERSION=124
> # CONFIG_PANIC_ON_OOPS is not set
> CONFIG_PANIC_ON_OOPS_VALUE=0
> CONFIG_PANIC_TIMEOUT=0
> @@ -1523,7 +1518,6 @@ CONFIG_SERIO_SERPORT=y
> # CONFIG_SFP is undefined
> CONFIG_SGETMASK_SYSCALL=y
> # CONFIG_SGI_PARTITION is undefined
> -CONFIG_SGL_ALLOC=y
> CONFIG_SG_POOL=y
> # CONFIG_SIS190 is not set
> # CONFIG_SIS900 is not set
> @@ -1602,6 +1596,15 @@ CONFIG_TEXTSEARCH_KMP=m
> # CONFIG_TPS65010 is undefined
> CONFIG_TUN=m
> # CONFIG_TXGBE is not set
> +# CONFIG_UBIFS_ATIME_SUPPORT is undefined
> +# CONFIG_UBIFS_FS is undefined
> +# CONFIG_UBIFS_FS_ADVANCED_COMPR is undefined
> +# CONFIG_UBIFS_FS_AUTHENTICATION is undefined
> +# CONFIG_UBIFS_FS_LZO is undefined
> +# CONFIG_UBIFS_FS_SECURITY is undefined
> +# CONFIG_UBIFS_FS_XATTR is undefined
> +# CONFIG_UBIFS_FS_ZLIB is undefined
> +# CONFIG_UBIFS_FS_ZSTD is undefined
> # CONFIG_UEVENT_HELPER is not set
> # CONFIG_UEVENT_HELPER_PATH is undefined
> # CONFIG_UFS_FS is undefined
> --
> 2.39.2
>
>
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [DistroKit] [PATCH 1/2] mipsel: sync kernelconfig
2024-07-31 9:14 [DistroKit] [PATCH 1/2] mipsel: sync kernelconfig Roland Hieber
` (2 preceding siblings ...)
2024-07-31 12:07 ` Alexander Dahl
@ 2024-07-31 12:10 ` Michael Olbrich
2024-07-31 12:23 ` Roland Hieber
2024-08-08 12:28 ` [DistroKit] [PATCH v2 01/10] mipsel: remove forked host-qemu rule Roland Hieber
4 siblings, 1 reply; 20+ messages in thread
From: Michael Olbrich @ 2024-07-31 12:10 UTC (permalink / raw)
To: Roland Hieber; +Cc: Oleksij Rempel, distrokit
On Wed, Jul 31, 2024 at 11:14:34AM +0200, Roland Hieber wrote:
> Part of the changes stem from the toolchain update (commit
> 282b31d940f79ed01352, 2024-04-22, Ladislav Michl: "mipsel: update to
> OSELAS.Toolchain 2023.07.1"), other parts in the kernel-malta config
> were just out of sync with the main kernelconfig. Use default values for
> all prompted options.
>
> Cc: Oleksij Rempel <o.rempel@pengutronix.de>
> Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> ---
> configs/platform-mipsel/kernelconfig | 2 +-
> configs/platform-mipsel/kernelconfig-malta | 15 +++++++++----
> .../platform-mipsel/kernelconfig-malta.diff | 21 +++++++++++--------
> 3 files changed, 24 insertions(+), 14 deletions(-)
>
> diff --git a/configs/platform-mipsel/kernelconfig b/configs/platform-mipsel/kernelconfig
> index 499b7b6c1d17..176969bb7c9b 100644
> --- a/configs/platform-mipsel/kernelconfig
> +++ b/configs/platform-mipsel/kernelconfig
> @@ -17,7 +17,7 @@ CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
> CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y
> CONFIG_CC_HAS_ASM_INLINE=y
> CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
> -CONFIG_PAHOLE_VERSION=0
> +CONFIG_PAHOLE_VERSION=124
This looks suspicious. This is probably a host leak. There is no
host-pahole package. The PTXdist upstream kernel package has PAHOLE=false
in the make opts. That seems to be missing in the mips kernel packages.
Michael
> CONFIG_IRQ_WORK=y
> CONFIG_BUILDTIME_TABLE_SORT=y
>
> diff --git a/configs/platform-mipsel/kernelconfig-malta b/configs/platform-mipsel/kernelconfig-malta
> index 35d3219ab371..6f73c6047892 100644
> --- a/configs/platform-mipsel/kernelconfig-malta
> +++ b/configs/platform-mipsel/kernelconfig-malta
> @@ -2,9 +2,9 @@
> # Automatically generated file; DO NOT EDIT.
> # Linux/mips 6.4.10 Kernel Configuration
> #
> -CONFIG_CC_VERSION_TEXT="mipsel-softfloat-linux-gnu-gcc (OSELAS.Toolchain-2023.07.0 13-20230624) 13.1.1 20230624"
> +CONFIG_CC_VERSION_TEXT="mipsel-softfloat-linux-gnu-gcc (OSELAS.Toolchain-2023.07.1 13-20231118) 13.2.1 20231118"
> CONFIG_CC_IS_GCC=y
> -CONFIG_GCC_VERSION=130101
> +CONFIG_GCC_VERSION=130201
> CONFIG_CLANG_VERSION=0
> CONFIG_AS_IS_GNU=y
> CONFIG_AS_VERSION=24000
> @@ -1450,6 +1450,7 @@ CONFIG_BLK_DEV=y
> # CONFIG_BLK_DEV_NULL_BLK is not set
> # CONFIG_BLK_DEV_FD is not set
> # CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set
> +# CONFIG_ZRAM is not set
> CONFIG_BLK_DEV_LOOP=m
> CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
> # CONFIG_BLK_DEV_DRBD is not set
> @@ -3500,11 +3501,11 @@ CONFIG_CRYPTO_CRC32C=y
> # Compression
> #
> CONFIG_CRYPTO_DEFLATE=m
> -# CONFIG_CRYPTO_LZO is not set
> +CONFIG_CRYPTO_LZO=y
> # CONFIG_CRYPTO_842 is not set
> # CONFIG_CRYPTO_LZ4 is not set
> # CONFIG_CRYPTO_LZ4HC is not set
> -# CONFIG_CRYPTO_ZSTD is not set
> +CONFIG_CRYPTO_ZSTD=y
> # end of Compression
>
> #
> @@ -3621,9 +3622,15 @@ CONFIG_CRC32_SLICEBY8=y
> # CONFIG_CRC7 is not set
> CONFIG_LIBCRC32C=m
> # CONFIG_CRC8 is not set
> +CONFIG_XXHASH=y
> # CONFIG_RANDOM32_SELFTEST is not set
> CONFIG_ZLIB_INFLATE=m
> CONFIG_ZLIB_DEFLATE=m
> +CONFIG_LZO_COMPRESS=y
> +CONFIG_LZO_DECOMPRESS=y
> +CONFIG_ZSTD_COMMON=y
> +CONFIG_ZSTD_COMPRESS=y
> +CONFIG_ZSTD_DECOMPRESS=y
> # CONFIG_XZ_DEC is not set
> CONFIG_GENERIC_ALLOCATOR=y
> CONFIG_TEXTSEARCH=y
> diff --git a/configs/platform-mipsel/kernelconfig-malta.diff b/configs/platform-mipsel/kernelconfig-malta.diff
> index 941646631905..032020ae876a 100644
> --- a/configs/platform-mipsel/kernelconfig-malta.diff
> +++ b/configs/platform-mipsel/kernelconfig-malta.diff
> @@ -1,4 +1,4 @@
> -bb72d3559ad286bbed584fb7dce43ed7
> +2b532330125b9ad63586ebb2fff9745a
> # CONFIG_8139CP is not set
> # CONFIG_8139TOO is not set
> # CONFIG_ACENIC is not set
> @@ -84,10 +84,10 @@ CONFIG_BLK_DEV_BSG=y
> CONFIG_BLK_DEV_BSGLIB=y
> CONFIG_BLK_DEV_BSG_COMMON=y
> CONFIG_BLK_DEV_DM=m
> -# CONFIG_BLK_DEV_FD is not set
> CONFIG_BLK_DEV_LOOP=m
> CONFIG_BLK_DEV_MD=m
> # CONFIG_BLK_DEV_NVME is not set
> +# CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set
> CONFIG_BLK_DEV_SD=y
> # CONFIG_BLK_DEV_SR is not set
> CONFIG_BLK_MQ_PCI=y
> @@ -160,7 +160,6 @@ CONFIG_CRC32_SLICEBY8=y
> # CONFIG_CRC_CCITT is not set
> CONFIG_CRC_ITU_T=m
> CONFIG_CROSS_MEMORY_ATTACH=y
> -CONFIG_CRYPTO_ACOMP2=y
> CONFIG_CRYPTO_AEAD2=y
> CONFIG_CRYPTO_AEAD=m
> CONFIG_CRYPTO_AES=m
> @@ -207,7 +206,6 @@ CONFIG_CRYPTO_ESSIV=m
> CONFIG_CRYPTO_FCRYPT=m
> CONFIG_CRYPTO_GCM=m
> CONFIG_CRYPTO_GHASH=m
> -CONFIG_CRYPTO_HASH_INFO=y
> CONFIG_CRYPTO_HMAC=y
> CONFIG_CRYPTO_HW=y
> CONFIG_CRYPTO_JITTERENTROPY=m
> @@ -830,11 +828,7 @@ CONFIG_MTD_OOPS=m
> # CONFIG_MTD_PHYSMAP_VERSATILE is undefined
> # CONFIG_MTD_PMC551 is not set
> CONFIG_MTD_UBI=m
> -CONFIG_MTD_UBI_BEB_LIMIT=20
> -# CONFIG_MTD_UBI_BLOCK is not set
> -# CONFIG_MTD_UBI_FASTMAP is not set
> CONFIG_MTD_UBI_GLUEBI=m
> -CONFIG_MTD_UBI_WL_THRESHOLD=4096
> CONFIG_MULTIPLEXER=y
> # CONFIG_MUX_ADG792A is not set
> # CONFIG_MUX_MMIO is not set
> @@ -1116,6 +1110,7 @@ CONFIG_OF_MDIO=m
> CONFIG_PAGE_POOL_STATS=y
> CONFIG_PAGE_SIZE_16KB=y
> # CONFIG_PAGE_SIZE_4KB is not set
> +CONFIG_PAHOLE_VERSION=124
> # CONFIG_PANIC_ON_OOPS is not set
> CONFIG_PANIC_ON_OOPS_VALUE=0
> CONFIG_PANIC_TIMEOUT=0
> @@ -1523,7 +1518,6 @@ CONFIG_SERIO_SERPORT=y
> # CONFIG_SFP is undefined
> CONFIG_SGETMASK_SYSCALL=y
> # CONFIG_SGI_PARTITION is undefined
> -CONFIG_SGL_ALLOC=y
> CONFIG_SG_POOL=y
> # CONFIG_SIS190 is not set
> # CONFIG_SIS900 is not set
> @@ -1602,6 +1596,15 @@ CONFIG_TEXTSEARCH_KMP=m
> # CONFIG_TPS65010 is undefined
> CONFIG_TUN=m
> # CONFIG_TXGBE is not set
> +# CONFIG_UBIFS_ATIME_SUPPORT is undefined
> +# CONFIG_UBIFS_FS is undefined
> +# CONFIG_UBIFS_FS_ADVANCED_COMPR is undefined
> +# CONFIG_UBIFS_FS_AUTHENTICATION is undefined
> +# CONFIG_UBIFS_FS_LZO is undefined
> +# CONFIG_UBIFS_FS_SECURITY is undefined
> +# CONFIG_UBIFS_FS_XATTR is undefined
> +# CONFIG_UBIFS_FS_ZLIB is undefined
> +# CONFIG_UBIFS_FS_ZSTD is undefined
> # CONFIG_UEVENT_HELPER is not set
> # CONFIG_UEVENT_HELPER_PATH is undefined
> # CONFIG_UFS_FS is undefined
> --
> 2.39.2
>
>
>
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [DistroKit] [PATCH 1/2] mipsel: sync kernelconfig
2024-07-31 12:10 ` Michael Olbrich
@ 2024-07-31 12:23 ` Roland Hieber
2024-07-31 12:33 ` Robert Schwebel
0 siblings, 1 reply; 20+ messages in thread
From: Roland Hieber @ 2024-07-31 12:23 UTC (permalink / raw)
To: distrokit, Oleksij Rempel
On Wed, Jul 31, 2024 at 02:10:34PM +0200, Michael Olbrich wrote:
> On Wed, Jul 31, 2024 at 11:14:34AM +0200, Roland Hieber wrote:
> > Part of the changes stem from the toolchain update (commit
> > 282b31d940f79ed01352, 2024-04-22, Ladislav Michl: "mipsel: update to
> > OSELAS.Toolchain 2023.07.1"), other parts in the kernel-malta config
> > were just out of sync with the main kernelconfig. Use default values for
> > all prompted options.
> >
> > Cc: Oleksij Rempel <o.rempel@pengutronix.de>
> > Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> > ---
> > configs/platform-mipsel/kernelconfig | 2 +-
> > configs/platform-mipsel/kernelconfig-malta | 15 +++++++++----
> > .../platform-mipsel/kernelconfig-malta.diff | 21 +++++++++++--------
> > 3 files changed, 24 insertions(+), 14 deletions(-)
> >
> > diff --git a/configs/platform-mipsel/kernelconfig b/configs/platform-mipsel/kernelconfig
> > index 499b7b6c1d17..176969bb7c9b 100644
> > --- a/configs/platform-mipsel/kernelconfig
> > +++ b/configs/platform-mipsel/kernelconfig
> > @@ -17,7 +17,7 @@ CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
> > CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y
> > CONFIG_CC_HAS_ASM_INLINE=y
> > CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
> > -CONFIG_PAHOLE_VERSION=0
> > +CONFIG_PAHOLE_VERSION=124
>
> This looks suspicious. This is probably a host leak. There is no
> host-pahole package. The PTXdist upstream kernel package has PAHOLE=false
> in the make opts. That seems to be missing in the mips kernel packages.
Yes, I also don't think we need a kernel.make in mips and mipsel at all,
we can just use the upstream rule. I'll send a v2.
- Roland
--
Roland Hieber, Pengutronix e.K. | r.hieber@pengutronix.de |
Steuerwalder Str. 21 | https://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [DistroKit] [PATCH 1/2] mipsel: sync kernelconfig
2024-07-31 12:23 ` Roland Hieber
@ 2024-07-31 12:33 ` Robert Schwebel
0 siblings, 0 replies; 20+ messages in thread
From: Robert Schwebel @ 2024-07-31 12:33 UTC (permalink / raw)
To: Roland Hieber; +Cc: Oleksij Rempel, distrokit
On Wed, Jul 31, 2024 at 02:23:11PM +0200, Roland Hieber wrote:
> Yes, I also don't think we need a kernel.make in mips and mipsel at all,
> we can just use the upstream rule. I'll send a v2.
Ok.
rsc
--
Pengutronix e.K. | Dipl.-Ing. Robert Schwebel |
Steuerwalder Str. 21 | https://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-9 |
^ permalink raw reply [flat|nested] 20+ messages in thread
* [DistroKit] [PATCH v2 01/10] mipsel: remove forked host-qemu rule
2024-07-31 9:14 [DistroKit] [PATCH 1/2] mipsel: sync kernelconfig Roland Hieber
` (3 preceding siblings ...)
2024-07-31 12:10 ` Michael Olbrich
@ 2024-08-08 12:28 ` Roland Hieber
2024-08-08 12:28 ` [DistroKit] [PATCH v2 02/10] mipsel: sync kernelconfig Roland Hieber
` (9 more replies)
4 siblings, 10 replies; 20+ messages in thread
From: Roland Hieber @ 2024-08-08 12:28 UTC (permalink / raw)
To: distrokit; +Cc: Roland Hieber
This rule was forked in commit eaf7839876093a6c34f8 (2021-07-08, Oleksij
Rempel: "platform-mipsel: add basic qemu malta support"), which has been
merged upstream in PTXdist 2023.11.0. As we are currently using PTXdist
2024.05.0, remove our outdated fork.
Link: https://git.pengutronix.de/cgit/ptxdist/commit/?h=572e3440d6f8206e949c
Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
configs/platform-mipsel/rules/host-qemu.make | 244 -------------------
1 file changed, 244 deletions(-)
delete mode 100644 configs/platform-mipsel/rules/host-qemu.make
diff --git a/configs/platform-mipsel/rules/host-qemu.make b/configs/platform-mipsel/rules/host-qemu.make
deleted file mode 100644
index 8d377ffa55f8..000000000000
--- a/configs/platform-mipsel/rules/host-qemu.make
+++ /dev/null
@@ -1,244 +0,0 @@
-# -*-makefile-*-
-#
-# Copyright (C) 2012 by Bernhard Walle <bernhard@bwalle.de>
-# (C) 2013 by Michael Olbrich <m.olbrich@pengutronix.de>
-# (C) 2013 by Jan Luebbe <j.luebbe@pengutronix.de>
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-HOST_PACKAGES-$(PTXCONF_HOST_QEMU) += host-qemu
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-#
-# autoconf
-#
-
-HOST_QEMU_BROKEN_ICECC := \
- $(call ptx/sh, gcc -dumpversion | awk -F . '{ if ($$1*100 + $$2 < 409) print "y" }')
-
-ifeq ($(HOST_QEMU_BROKEN_ICECC),y)
-HOST_QEMU_MAKE_ENV := PTXDIST_ICECC=$(PTXDIST_ICERUN)
-endif
-HOST_QEMU_MAKE_OPT := V=$(filter 1,$(PTXDIST_VERBOSE))
-
-HOST_QEMU_TARGETS := $(PTXCONF_ARCH_STRING)
-ifndef PTXCONF_ARCH_X86_64
-ifdef PTXCONF_ARCH_X86
-HOST_QEMU_TARGETS := i386
-endif
-endif
-ifdef PTXCONF_ARCH_ARM64
-HOST_QEMU_TARGETS := aarch64
-endif
-ifdef PTXCONF_ARCH_MIPS
-ifdef PTXCONF_ENDIAN_LITTLE
-HOST_QEMU_TARGETS := mipsel
-endif
-endif
-HOST_QEMU_SYS_TARGETS := $(patsubst %,%-softmmu,$(HOST_QEMU_TARGETS))
-HOST_QEMU_USR_TARGETS := $(patsubst %,%-linux-user,$(HOST_QEMU_TARGETS))
-
-HOST_QEMU_CONF_TOOL := autoconf
-# Note: not really autoconf:
-# e.g. there is --enable-debug but not --disable-debug
-HOST_QEMU_CONF_OPT := \
- --prefix=/usr \
- --target-list=" \
- $(call ptx/ifdef, PTXCONF_HOST_QEMU_SYS,$(HOST_QEMU_SYS_TARGETS),) \
- $(call ptx/ifdef, PTXCONF_HOST_QEMU_USR,$(HOST_QEMU_USR_TARGETS),) \
- " \
- --ninja=ninja \
- --disable-download \
- --disable-sanitizers \
- --disable-tsan \
- --disable-werror \
- --enable-stack-protector \
- --with-coroutine=auto \
- --disable-plugins \
- --disable-containers \
- --audio-drv-list= \
- --block-drv-ro-whitelist= \
- --block-drv-rw-whitelist= \
- --enable-coroutine-pool \
- --disable-cfi \
- --disable-debug-mutex \
- --enable-fdt \
- --disable-fuzzing \
- --disable-lto \
- --disable-module-upgrades \
- --disable-qom-cast-debug \
- --disable-rng-none \
- --disable-strip \
- --disable-tcg-interpreter \
- --enable-trace-backends=nop \
- --tls-priority=NORMAL \
- --disable-alsa \
- --enable-attr \
- --disable-auth-pam \
- --disable-blkio \
- --disable-bochs \
- --disable-bpf \
- --disable-brlapi \
- --disable-bzip2 \
- --disable-canokey \
- --enable-cap-ng \
- --disable-capstone \
- --disable-cloop \
- --disable-cocoa \
- --disable-coreaudio \
- --disable-crypto-afalg \
- --disable-curl \
- --disable-curses \
- --disable-dmg \
- --disable-docs \
- --disable-dsound \
- --disable-fuse \
- --disable-fuse-lseek \
- --disable-gcrypt \
- --disable-gettext \
- --disable-gio \
- --disable-glusterfs \
- --disable-gnutls \
- --disable-gtk \
- --disable-gtk-clipboard \
- --disable-guest-agent \
- --disable-guest-agent-msi \
- --disable-hax \
- --disable-hvf \
- --enable-iconv \
- --disable-jack \
- --disable-keyring \
- --enable-kvm \
- --disable-l2tpv3 \
- --disable-libdaxctl \
- --disable-libdw \
- --disable-libiscsi \
- --disable-libnfs \
- --disable-libpmem \
- --disable-libssh \
- --disable-libudev \
- --$(call ptx/endis, PTXCONF_HOST_QEMU_SYS)-libusb \
- --disable-libvduse \
- --disable-linux-aio \
- --disable-linux-io-uring \
- --disable-live-block-migration \
- --disable-lzfse \
- --disable-lzo \
- --enable-malloc-trim \
- --enable-membarrier \
- --disable-mpath \
- --enable-multiprocess \
- --disable-netmap \
- --disable-nettle \
- --disable-numa \
- --disable-nvmm \
- --disable-opengl \
- --disable-oss \
- --disable-pa \
- --disable-pipewire \
- --disable-parallels \
- --disable-png \
- --disable-pvrdma \
- --disable-qcow1 \
- --disable-qed \
- --disable-qga-vss \
- --disable-rbd \
- --disable-rdma \
- --disable-replication \
- --disable-sdl \
- --disable-sdl-image \
- --disable-seccomp \
- --disable-selinux \
- --enable-slirp \
- --disable-slirp-smbd \
- --disable-smartcard \
- --disable-snappy \
- --disable-sndio \
- --disable-sparse \
- --disable-spice \
- --disable-spice-protocol \
- --enable-tcg \
- --disable-tools \
- --disable-tpm \
- --disable-u2f \
- --disable-usb-redir \
- --disable-vdi \
- --disable-vduse-blk-export \
- --disable-vfio-user-server \
- --disable-vhost-crypto \
- --enable-vhost-kernel \
- --enable-vhost-net \
- --disable-vhost-user \
- --disable-vhost-user-blk-server \
- --disable-vhost-vdpa \
- --disable-virglrenderer \
- --$(call ptx/endis, PTXCONF_HOST_QEMU_SYS)-virtfs \
- --disable-vmnet \
- --disable-vnc \
- --disable-vnc-jpeg \
- --disable-vnc-sasl \
- --disable-vte \
- --disable-vvfat \
- --disable-whpx \
- --disable-xen \
- --disable-xen-pci-passthrough \
- --disable-xkbcommon \
- --disable-zstd \
- --$(call ptx/endis, PTXCONF_HOST_QEMU_SYS)-system \
- --disable-user \
- --$(call ptx/endis, PTXCONF_HOST_QEMU_USR)-linux-user \
- --disable-bsd-user \
- --enable-pie \
- --disable-modules \
- --disable-debug-tcg \
- --disable-debug-info \
- --disable-safe-stack
-
-# Use '=' to delay $(shell ...) calls until this is needed
-QEMU_CROSS_QEMU = $(call ptx/get-alternative, config/qemu, qemu-cross)
-QEMU_CROSS_DL = $(shell ptxd_cross_cc_v | sed -n -e 's/.* -dynamic-linker \([^ ]*\).*/\1/p')
-QEMU_CROSS_TOOLEXECLIBDIR = $(shell dirname $$(realpath $$(ptxd_cross_cc -print-file-name=libatomic.so 2> /dev/null)))
-QEMU_CROSS_LD_LIBRARY_PATH = $(PTXDIST_SYSROOT_TOOLCHAIN)/lib:$(QEMU_CROSS_TOOLEXECLIBDIR):$(SYSROOT)/lib:$(SYSROOT)/usr/lib
-
-QEMU_CROSS_QEMU_ENV = \
- QEMU="$(PTXDIST_SYSROOT_HOST)/usr/bin/qemu-$(HOST_QEMU_TARGETS)" \
- KERNEL_VERSION="$(KERNEL_VERSION)" \
- QEMU_LD_PREFIX="$(PTXDIST_SYSROOT_TOOLCHAIN)" \
- QEMU_LD_LIBRARY_PATH="$(QEMU_CROSS_LD_LIBRARY_PATH)" \
- LINKER="$(shell readlink -f "$$(ptxd_cross_cc -print-file-name=$$(ptxd_get_dl))")"
-
-$(STATEDIR)/host-qemu.install:
- @$(call targetinfo)
- @$(call world/install, HOST_QEMU)
-ifdef PTXCONF_HOST_QEMU_SYS
-# # necessary for qemu to find its ROM files
- @ln -vsf share/qemu $(HOST_QEMU_PKGDIR)/usr/pc-bios
-endif
- @$(call touch)
-
-$(STATEDIR)/host-qemu.install.post:
- @$(call targetinfo)
- @$(call world/install.post, HOST_QEMU)
-ifdef PTXCONF_HOST_QEMU_USR
- @$(QEMU_CROSS_QEMU_ENV) ptxd_replace_magic $(QEMU_CROSS_QEMU) > $(PTXDIST_SYSROOT_CROSS)/usr/bin/qemu-cross
- @chmod +x $(PTXDIST_SYSROOT_CROSS)/usr/bin/qemu-cross
- @install -d -m 755 $(PTXDIST_SYSROOT_CROSS)/usr/bin/qemu/
- @sed \
- -e 's|RTLDLIST=.*|RTLDLIST="$(PTXDIST_SYSROOT_TOOLCHAIN)$(QEMU_CROSS_DL)"|' \
- -e 's|eval $$add_env|eval $(PTXDIST_SYSROOT_CROSS)/usr/bin/qemu-cross -E "$${add_env// /,}"|' \
- -e 's|verify_out=`|verify_out=`$(PTXDIST_SYSROOT_CROSS)/usr/bin/qemu-cross |' \
- -e 's|#! */.*$$|#!$(shell readlink $(PTXDIST_TOPDIR)/bin/bash)|' \
- $(PTXDIST_SYSROOT_TOOLCHAIN)/usr/bin/ldd > $(PTXDIST_SYSROOT_CROSS)/usr/bin/qemu/ldd
- @chmod +x $(PTXDIST_SYSROOT_CROSS)/usr/bin/qemu/ldd
-endif
- @$(call touch)
-
-# vim: syntax=make
--
2.39.2
^ permalink raw reply [flat|nested] 20+ messages in thread
* [DistroKit] [PATCH v2 02/10] mipsel: sync kernelconfig
2024-08-08 12:28 ` [DistroKit] [PATCH v2 01/10] mipsel: remove forked host-qemu rule Roland Hieber
@ 2024-08-08 12:28 ` Roland Hieber
2024-08-08 12:28 ` [DistroKit] [PATCH v2 03/10] mips, mipsel: remove forked kernel rule Roland Hieber
` (8 subsequent siblings)
9 siblings, 0 replies; 20+ messages in thread
From: Roland Hieber @ 2024-08-08 12:28 UTC (permalink / raw)
To: distrokit; +Cc: Roland Hieber
Part of the changes stem from the toolchain update (commit
282b31d940f79ed01352, 2024-04-22, Ladislav Michl: "mipsel: update to
OSELAS.Toolchain 2023.07.1"), other parts in the kernel-malta config
were just out of sync with the main kernelconfig. Use default values for
all prompted options.
The changes in the PAHOLE version stem from the fact that our kernel
rules are outdated, which we'll fix in later commits. Nevertheless, keep
the kernelconfigs in sync so as not to break bisectability.
Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
configs/platform-mipsel/kernelconfig | 2 +-
configs/platform-mipsel/kernelconfig-malta | 15 ++++++++++----
.../platform-mipsel/kernelconfig-malta.diff | 20 ++++++++++---------
3 files changed, 23 insertions(+), 14 deletions(-)
diff --git a/configs/platform-mipsel/kernelconfig b/configs/platform-mipsel/kernelconfig
index 499b7b6c1d17..176969bb7c9b 100644
--- a/configs/platform-mipsel/kernelconfig
+++ b/configs/platform-mipsel/kernelconfig
@@ -17,7 +17,7 @@ CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y
CONFIG_CC_HAS_ASM_INLINE=y
CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
-CONFIG_PAHOLE_VERSION=0
+CONFIG_PAHOLE_VERSION=124
CONFIG_IRQ_WORK=y
CONFIG_BUILDTIME_TABLE_SORT=y
diff --git a/configs/platform-mipsel/kernelconfig-malta b/configs/platform-mipsel/kernelconfig-malta
index 35d3219ab371..6f73c6047892 100644
--- a/configs/platform-mipsel/kernelconfig-malta
+++ b/configs/platform-mipsel/kernelconfig-malta
@@ -2,9 +2,9 @@
# Automatically generated file; DO NOT EDIT.
# Linux/mips 6.4.10 Kernel Configuration
#
-CONFIG_CC_VERSION_TEXT="mipsel-softfloat-linux-gnu-gcc (OSELAS.Toolchain-2023.07.0 13-20230624) 13.1.1 20230624"
+CONFIG_CC_VERSION_TEXT="mipsel-softfloat-linux-gnu-gcc (OSELAS.Toolchain-2023.07.1 13-20231118) 13.2.1 20231118"
CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=130101
+CONFIG_GCC_VERSION=130201
CONFIG_CLANG_VERSION=0
CONFIG_AS_IS_GNU=y
CONFIG_AS_VERSION=24000
@@ -1450,6 +1450,7 @@ CONFIG_BLK_DEV=y
# CONFIG_BLK_DEV_NULL_BLK is not set
# CONFIG_BLK_DEV_FD is not set
# CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set
+# CONFIG_ZRAM is not set
CONFIG_BLK_DEV_LOOP=m
CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
# CONFIG_BLK_DEV_DRBD is not set
@@ -3500,11 +3501,11 @@ CONFIG_CRYPTO_CRC32C=y
# Compression
#
CONFIG_CRYPTO_DEFLATE=m
-# CONFIG_CRYPTO_LZO is not set
+CONFIG_CRYPTO_LZO=y
# CONFIG_CRYPTO_842 is not set
# CONFIG_CRYPTO_LZ4 is not set
# CONFIG_CRYPTO_LZ4HC is not set
-# CONFIG_CRYPTO_ZSTD is not set
+CONFIG_CRYPTO_ZSTD=y
# end of Compression
#
@@ -3621,9 +3622,15 @@ CONFIG_CRC32_SLICEBY8=y
# CONFIG_CRC7 is not set
CONFIG_LIBCRC32C=m
# CONFIG_CRC8 is not set
+CONFIG_XXHASH=y
# CONFIG_RANDOM32_SELFTEST is not set
CONFIG_ZLIB_INFLATE=m
CONFIG_ZLIB_DEFLATE=m
+CONFIG_LZO_COMPRESS=y
+CONFIG_LZO_DECOMPRESS=y
+CONFIG_ZSTD_COMMON=y
+CONFIG_ZSTD_COMPRESS=y
+CONFIG_ZSTD_DECOMPRESS=y
# CONFIG_XZ_DEC is not set
CONFIG_GENERIC_ALLOCATOR=y
CONFIG_TEXTSEARCH=y
diff --git a/configs/platform-mipsel/kernelconfig-malta.diff b/configs/platform-mipsel/kernelconfig-malta.diff
index 941646631905..ec0a67f42e54 100644
--- a/configs/platform-mipsel/kernelconfig-malta.diff
+++ b/configs/platform-mipsel/kernelconfig-malta.diff
@@ -1,4 +1,4 @@
-bb72d3559ad286bbed584fb7dce43ed7
+f4618f2656cf4f48bc6b8561c7b86726
# CONFIG_8139CP is not set
# CONFIG_8139TOO is not set
# CONFIG_ACENIC is not set
@@ -84,10 +84,10 @@ CONFIG_BLK_DEV_BSG=y
CONFIG_BLK_DEV_BSGLIB=y
CONFIG_BLK_DEV_BSG_COMMON=y
CONFIG_BLK_DEV_DM=m
-# CONFIG_BLK_DEV_FD is not set
CONFIG_BLK_DEV_LOOP=m
CONFIG_BLK_DEV_MD=m
# CONFIG_BLK_DEV_NVME is not set
+# CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set
CONFIG_BLK_DEV_SD=y
# CONFIG_BLK_DEV_SR is not set
CONFIG_BLK_MQ_PCI=y
@@ -160,7 +160,6 @@ CONFIG_CRC32_SLICEBY8=y
# CONFIG_CRC_CCITT is not set
CONFIG_CRC_ITU_T=m
CONFIG_CROSS_MEMORY_ATTACH=y
-CONFIG_CRYPTO_ACOMP2=y
CONFIG_CRYPTO_AEAD2=y
CONFIG_CRYPTO_AEAD=m
CONFIG_CRYPTO_AES=m
@@ -207,7 +206,6 @@ CONFIG_CRYPTO_ESSIV=m
CONFIG_CRYPTO_FCRYPT=m
CONFIG_CRYPTO_GCM=m
CONFIG_CRYPTO_GHASH=m
-CONFIG_CRYPTO_HASH_INFO=y
CONFIG_CRYPTO_HMAC=y
CONFIG_CRYPTO_HW=y
CONFIG_CRYPTO_JITTERENTROPY=m
@@ -830,11 +828,7 @@ CONFIG_MTD_OOPS=m
# CONFIG_MTD_PHYSMAP_VERSATILE is undefined
# CONFIG_MTD_PMC551 is not set
CONFIG_MTD_UBI=m
-CONFIG_MTD_UBI_BEB_LIMIT=20
-# CONFIG_MTD_UBI_BLOCK is not set
-# CONFIG_MTD_UBI_FASTMAP is not set
CONFIG_MTD_UBI_GLUEBI=m
-CONFIG_MTD_UBI_WL_THRESHOLD=4096
CONFIG_MULTIPLEXER=y
# CONFIG_MUX_ADG792A is not set
# CONFIG_MUX_MMIO is not set
@@ -1523,7 +1517,6 @@ CONFIG_SERIO_SERPORT=y
# CONFIG_SFP is undefined
CONFIG_SGETMASK_SYSCALL=y
# CONFIG_SGI_PARTITION is undefined
-CONFIG_SGL_ALLOC=y
CONFIG_SG_POOL=y
# CONFIG_SIS190 is not set
# CONFIG_SIS900 is not set
@@ -1602,6 +1595,15 @@ CONFIG_TEXTSEARCH_KMP=m
# CONFIG_TPS65010 is undefined
CONFIG_TUN=m
# CONFIG_TXGBE is not set
+# CONFIG_UBIFS_ATIME_SUPPORT is undefined
+# CONFIG_UBIFS_FS is undefined
+# CONFIG_UBIFS_FS_ADVANCED_COMPR is undefined
+# CONFIG_UBIFS_FS_AUTHENTICATION is undefined
+# CONFIG_UBIFS_FS_LZO is undefined
+# CONFIG_UBIFS_FS_SECURITY is undefined
+# CONFIG_UBIFS_FS_XATTR is undefined
+# CONFIG_UBIFS_FS_ZLIB is undefined
+# CONFIG_UBIFS_FS_ZSTD is undefined
# CONFIG_UEVENT_HELPER is not set
# CONFIG_UEVENT_HELPER_PATH is undefined
# CONFIG_UFS_FS is undefined
--
2.39.2
^ permalink raw reply [flat|nested] 20+ messages in thread
* [DistroKit] [PATCH v2 03/10] mips, mipsel: remove forked kernel rule
2024-08-08 12:28 ` [DistroKit] [PATCH v2 01/10] mipsel: remove forked host-qemu rule Roland Hieber
2024-08-08 12:28 ` [DistroKit] [PATCH v2 02/10] mipsel: sync kernelconfig Roland Hieber
@ 2024-08-08 12:28 ` Roland Hieber
2024-08-08 12:28 ` [DistroKit] [PATCH v2 04/10] mips, mipsel: kernel-*: sync with template Roland Hieber
` (7 subsequent siblings)
9 siblings, 0 replies; 20+ messages in thread
From: Roland Hieber @ 2024-08-08 12:28 UTC (permalink / raw)
To: distrokit; +Cc: Roland Hieber
Our forked kernel rule is outdated, but it is only a stripped-down
version of the upstream kernel rule that does not actually build a
kernel, but is used to provide a REF_CONFIG for other kernel recipes.
Remove the forked rule to make future maintainance easier, and set the
platformconfig options and the KERNEL_MAKE_ENV suitably so that the
upstream kernel rule does the same as before. Also run 'oldconfig' to
update the kernelconfig and pick up the changes from the upstream kernel
rule.
The changes in the PAHOLE version in the kernelconfig diffs stem from
the fact that the kernel rules are outdated, which we'll fix in later
commits. Nevertheless, keep the kernelconfigs in sync so as not to break
bisectability.
Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
configs/platform-mips/kernelconfig | 1 -
.../platform-mips/kernelconfig-ar9331.diff | 3 +-
configs/platform-mips/kernelconfig-malta.diff | 3 +-
configs/platform-mips/platformconfig | 35 ++++++++
configs/platform-mips/platforms/kernel.in | 26 ------
configs/platform-mips/rules/kernel.make | 83 -------------------
.../platform-mips/rules/kernel.noexec.make | 2 +
configs/platform-mipsel/kernelconfig | 3 +-
.../platform-mipsel/kernelconfig-malta.diff | 4 +-
configs/platform-mipsel/platformconfig | 35 ++++++++
configs/platform-mipsel/platforms/kernel.in | 26 ------
configs/platform-mipsel/rules/kernel.make | 82 ------------------
.../platform-mipsel/rules/kernel.noexec.make | 2 +
13 files changed, 79 insertions(+), 226 deletions(-)
delete mode 100644 configs/platform-mips/platforms/kernel.in
delete mode 100644 configs/platform-mips/rules/kernel.make
create mode 100644 configs/platform-mips/rules/kernel.noexec.make
delete mode 100644 configs/platform-mipsel/platforms/kernel.in
delete mode 100644 configs/platform-mipsel/rules/kernel.make
create mode 100644 configs/platform-mipsel/rules/kernel.noexec.make
diff --git a/configs/platform-mips/kernelconfig b/configs/platform-mips/kernelconfig
index a84595b3abdd..98f3196ef1ef 100644
--- a/configs/platform-mips/kernelconfig
+++ b/configs/platform-mips/kernelconfig
@@ -474,7 +474,6 @@ CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
# end of GCOV-based kernel profiling
CONFIG_HAVE_GCC_PLUGINS=y
-# CONFIG_GCC_PLUGINS is not set
CONFIG_FUNCTION_ALIGNMENT=0
# end of General architecture-dependent options
diff --git a/configs/platform-mips/kernelconfig-ar9331.diff b/configs/platform-mips/kernelconfig-ar9331.diff
index e58712b1d558..727497c2a06c 100644
--- a/configs/platform-mips/kernelconfig-ar9331.diff
+++ b/configs/platform-mips/kernelconfig-ar9331.diff
@@ -1,4 +1,4 @@
-13afb78f9f73380b2d43b220956bd5d8
+af97ac2360293c1315a7accdcaa0b01e
# CONFIG_ACORN_PARTITION is undefined
# CONFIG_AIX_PARTITION is undefined
# CONFIG_AMIGA_PARTITION is undefined
@@ -6,7 +6,6 @@
CONFIG_BLK_DEBUG_FS=y
# CONFIG_BSD_DISKLABEL is undefined
# CONFIG_CMDLINE_PARTITION is undefined
-# CONFIG_GCC_PLUGINS is undefined
# CONFIG_KARMA_PARTITION is undefined
# CONFIG_LDM_PARTITION is undefined
CONFIG_LOCALVERSION="-ar9331"
diff --git a/configs/platform-mips/kernelconfig-malta.diff b/configs/platform-mips/kernelconfig-malta.diff
index 4aad01f21607..ce4b18d27390 100644
--- a/configs/platform-mips/kernelconfig-malta.diff
+++ b/configs/platform-mips/kernelconfig-malta.diff
@@ -1,4 +1,4 @@
-13afb78f9f73380b2d43b220956bd5d8
+af97ac2360293c1315a7accdcaa0b01e
# CONFIG_8139CP is not set
# CONFIG_8139TOO is not set
# CONFIG_ACENIC is not set
@@ -364,7 +364,6 @@ CONFIG_FUSE_FS=m
CONFIG_FWNODE_MDIO=m
CONFIG_GACT_PROB=y
CONFIG_GARP=m
-# CONFIG_GCC_PLUGINS is undefined
CONFIG_GENERIC_IRQ_EFFECTIVE_AFF_MASK=y
CONFIG_GENERIC_IRQ_IPI=y
CONFIG_GENERIC_ISA_DMA=y
diff --git a/configs/platform-mips/platformconfig b/configs/platform-mips/platformconfig
index 86e4d6f40537..6a7cab8ef6a7 100644
--- a/configs/platform-mips/platformconfig
+++ b/configs/platform-mips/platformconfig
@@ -114,9 +114,43 @@ PTXCONF_TARGET_EXTRA_LDFLAGS=""
# end of architecture
PTXCONF_KERNEL=y
+# PTXCONF_KERNEL_INSTALL is not set
+# PTXCONF_KERNEL_MODULES is not set
PTXCONF_KERNEL_VERSION="6.6"
PTXCONF_KERNEL_MD5="452098d80ba925af3a4ab35998f3aef5"
+# PTXCONF_KERNEL_IMAGE_BZ is not set
+# PTXCONF_KERNEL_IMAGE_Z is not set
+# PTXCONF_KERNEL_IMAGE_XIP is not set
+# PTXCONF_KERNEL_IMAGE_U is not set
+# PTXCONF_KERNEL_IMAGE_VM is not set
+# PTXCONF_KERNEL_IMAGE_VMLINUX is not set
+PTXCONF_KERNEL_IMAGE_VMLINUZ=y
+# PTXCONF_KERNEL_IMAGE_RAW is not set
+# PTXCONF_KERNEL_IMAGE_SIMPLE is not set
+PTXCONF_KERNEL_IMAGE="vmlinuz"
+# PTXCONF_KERNEL_DTB is not set
+# PTXCONF_KERNEL_DTBO is not set
+# PTXCONF_KERNEL_CODE_SIGNING is not set
+# PTXCONF_KERNEL_ZSTD is not set
+# PTXCONF_KERNEL_XZ is not set
PTXCONF_KERNEL_LZOP=y
+# PTXCONF_KERNEL_LZ4 is not set
+# PTXCONF_KERNEL_OPENSSL is not set
+# PTXCONF_KERNEL_LIBELF is not set
+# PTXCONF_KERNEL_GCC_PLUGINS is not set
+# PTXCONF_KERNEL_CONFIG_BASE_VERSION is not set
+
+#
+# patching & configuration
+#
+PTXCONF_KERNEL_SERIES="series"
+PTXCONF_KERNEL_CONFIG="kernelconfig"
+# end of patching & configuration
+
+#
+# Development features
+#
+PTXCONF_KERNEL_EXTRA_MAKEVARS=""
#
# console options
@@ -225,6 +259,7 @@ PTXCONF_HOST_OPENSSL=y
PTXCONF_HOST_P11_KIT=y
PTXCONF_HOST_SOFTHSM=y
PTXCONF_HOST_SQLITE=y
+PTXCONF_HOST_SYSTEM_BC=y
PTXCONF_HOST_SYSTEM_PYTHON3_FLIT_CORE=y
PTXCONF_HOST_SYSTEM_PYTHON3_INSTALLER=y
PTXCONF_HOST_SYSTEM_PYTHON3_PACKAGING=y
diff --git a/configs/platform-mips/platforms/kernel.in b/configs/platform-mips/platforms/kernel.in
deleted file mode 100644
index 1889211a7ae2..000000000000
--- a/configs/platform-mips/platforms/kernel.in
+++ /dev/null
@@ -1,26 +0,0 @@
-## SECTION=base_kernel
-
-menuconfig KERNEL
- bool
- default y
- prompt "Linux kernel "
-
-if KERNEL
-
-config KERNEL_VERSION
- prompt "kernel version"
- string
- default "4.15"
-
-config KERNEL_MD5
- prompt "kernel source md5sum"
- string
-
-config KERNEL_INSTALL
- bool
-
-config KERNEL_LZOP
- prompt "build lzop hosttool"
- bool
-
-endif # KERNEL
diff --git a/configs/platform-mips/rules/kernel.make b/configs/platform-mips/rules/kernel.make
deleted file mode 100644
index e4efb46f68de..000000000000
--- a/configs/platform-mips/rules/kernel.make
+++ /dev/null
@@ -1,83 +0,0 @@
-# -*-makefile-*-
-#
-# Copyright (C) 2002-2009 by Pengutronix e.K., Hildesheim, Germany
-# 2010 by Marc Kleine-Budde <mkl@pengutronix.de>
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-PACKAGES-$(PTXCONF_KERNEL) += kernel
-
-#
-# Paths and names
-#
-KERNEL := linux-$(KERNEL_VERSION)
-KERNEL_MD5 := $(call remove_quotes,$(PTXCONF_KERNEL_MD5))
-ifneq ($(KERNEL_NEEDS_GIT_URL),y)
-KERNEL_SUFFIX := tar.xz
-KERNEL_URL := $(call kernel-url, KERNEL)
-else
-KERNEL_SUFFIX := tar.gz
-KERNEL_URL := https://git.kernel.org/torvalds/t/$(KERNEL).$(KERNEL_SUFFIX)
-endif
-KERNEL_DIR := $(BUILDDIR)/$(KERNEL)
-KERNEL_BUILD_DIR := $(KERNEL_DIR)-build
-KERNEL_CONFIG := $(call ptx/in-platformconfigdir, kernelconfig)
-KERNEL_LICENSE := GPL-2.0-only
-KERNEL_SOURCE := $(SRCDIR)/$(KERNEL).$(KERNEL_SUFFIX)
-KERNEL_DEVPKG := NO
-KERNEL_BUILD_OOT := KEEP
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-KERNEL_CONF_OPT := \
- -C $(KERNEL_DIR) \
- O=$(KERNEL_BUILD_DIR) \
- PAHOLE=false \
- $(call kernel-opts, KERNEL)
-
-# no gcc plugins; avoid config changes depending on the host compiler
-KERNEL_CONF_OPT += \
- HOSTCXX=false
-
-ifdef PTXCONF_KERNEL
-$(KERNEL_CONFIG):
- @echo
- @echo "*************************************************************************"
- @echo "**** Please generate a kernelconfig with 'ptxdist menuconfig kernel' ****"
- @echo "*************************************************************************"
- @echo
- @echo
- @exit 1
-endif
-
-# ----------------------------------------------------------------------------
-# Compile
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/kernel.compile:
- @$(call targetinfo)
- @$(call touch)
-
-# ----------------------------------------------------------------------------
-# Install
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/kernel.install:
- @$(call targetinfo)
- @$(call touch)
-
-# ----------------------------------------------------------------------------
-# oldconfig / menuconfig
-# ----------------------------------------------------------------------------
-
-$(call ptx/kconfig-targets, kernel): $(STATEDIR)/kernel.extract
- @$(call world/kconfig, KERNEL, $(subst kernel_,,$@))
-
-# vim: syntax=make
diff --git a/configs/platform-mips/rules/kernel.noexec.make b/configs/platform-mips/rules/kernel.noexec.make
new file mode 100644
index 000000000000..df74af2c5b3d
--- /dev/null
+++ b/configs/platform-mips/rules/kernel.noexec.make
@@ -0,0 +1,2 @@
+# short-circuit the build since the recipe is only used to serve a REF_CONFIG
+KERNEL_MAKE_ENV=:
diff --git a/configs/platform-mipsel/kernelconfig b/configs/platform-mipsel/kernelconfig
index 176969bb7c9b..117c56cca057 100644
--- a/configs/platform-mipsel/kernelconfig
+++ b/configs/platform-mipsel/kernelconfig
@@ -17,7 +17,7 @@ CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y
CONFIG_CC_HAS_ASM_INLINE=y
CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
-CONFIG_PAHOLE_VERSION=124
+CONFIG_PAHOLE_VERSION=0
CONFIG_IRQ_WORK=y
CONFIG_BUILDTIME_TABLE_SORT=y
@@ -536,7 +536,6 @@ CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
# end of GCOV-based kernel profiling
CONFIG_HAVE_GCC_PLUGINS=y
-# CONFIG_GCC_PLUGINS is not set
CONFIG_FUNCTION_ALIGNMENT=0
# end of General architecture-dependent options
diff --git a/configs/platform-mipsel/kernelconfig-malta.diff b/configs/platform-mipsel/kernelconfig-malta.diff
index ec0a67f42e54..8e5b3352dedb 100644
--- a/configs/platform-mipsel/kernelconfig-malta.diff
+++ b/configs/platform-mipsel/kernelconfig-malta.diff
@@ -1,4 +1,4 @@
-f4618f2656cf4f48bc6b8561c7b86726
+9b8cb4d1395ae94191677a625040e2fa
# CONFIG_8139CP is not set
# CONFIG_8139TOO is not set
# CONFIG_ACENIC is not set
@@ -338,7 +338,6 @@ CONFIG_FUSE_FS=m
CONFIG_FWNODE_MDIO=m
CONFIG_GACT_PROB=y
CONFIG_GARP=m
-# CONFIG_GCC_PLUGINS is undefined
# CONFIG_GENERIC_PINCONF is undefined
# CONFIG_GENERIC_PINCTRL_GROUPS is undefined
# CONFIG_GENERIC_PINMUX_FUNCTIONS is undefined
@@ -1110,6 +1109,7 @@ CONFIG_OF_MDIO=m
CONFIG_PAGE_POOL_STATS=y
CONFIG_PAGE_SIZE_16KB=y
# CONFIG_PAGE_SIZE_4KB is not set
+CONFIG_PAHOLE_VERSION=124
# CONFIG_PANIC_ON_OOPS is not set
CONFIG_PANIC_ON_OOPS_VALUE=0
CONFIG_PANIC_TIMEOUT=0
diff --git a/configs/platform-mipsel/platformconfig b/configs/platform-mipsel/platformconfig
index ca1112e01e76..d69bab59bdd1 100644
--- a/configs/platform-mipsel/platformconfig
+++ b/configs/platform-mipsel/platformconfig
@@ -114,9 +114,43 @@ PTXCONF_TARGET_EXTRA_LDFLAGS=""
# end of architecture
PTXCONF_KERNEL=y
+# PTXCONF_KERNEL_INSTALL is not set
+# PTXCONF_KERNEL_MODULES is not set
PTXCONF_KERNEL_VERSION="6.4.10"
PTXCONF_KERNEL_MD5="2e19e7badc3d4b080bf6b4864912f2d3"
+# PTXCONF_KERNEL_IMAGE_BZ is not set
+# PTXCONF_KERNEL_IMAGE_Z is not set
+# PTXCONF_KERNEL_IMAGE_XIP is not set
+# PTXCONF_KERNEL_IMAGE_U is not set
+# PTXCONF_KERNEL_IMAGE_VM is not set
+# PTXCONF_KERNEL_IMAGE_VMLINUX is not set
+PTXCONF_KERNEL_IMAGE_VMLINUZ=y
+# PTXCONF_KERNEL_IMAGE_RAW is not set
+# PTXCONF_KERNEL_IMAGE_SIMPLE is not set
+PTXCONF_KERNEL_IMAGE="vmlinuz"
+# PTXCONF_KERNEL_DTB is not set
+# PTXCONF_KERNEL_DTBO is not set
+# PTXCONF_KERNEL_CODE_SIGNING is not set
+# PTXCONF_KERNEL_ZSTD is not set
+# PTXCONF_KERNEL_XZ is not set
PTXCONF_KERNEL_LZOP=y
+# PTXCONF_KERNEL_LZ4 is not set
+# PTXCONF_KERNEL_OPENSSL is not set
+# PTXCONF_KERNEL_LIBELF is not set
+# PTXCONF_KERNEL_GCC_PLUGINS is not set
+# PTXCONF_KERNEL_CONFIG_BASE_VERSION is not set
+
+#
+# patching & configuration
+#
+PTXCONF_KERNEL_SERIES="series"
+PTXCONF_KERNEL_CONFIG="kernelconfig"
+# end of patching & configuration
+
+#
+# Development features
+#
+PTXCONF_KERNEL_EXTRA_MAKEVARS=""
#
# console options
@@ -221,6 +255,7 @@ PTXCONF_HOST_OPENSSL=y
PTXCONF_HOST_P11_KIT=y
PTXCONF_HOST_SOFTHSM=y
PTXCONF_HOST_SQLITE=y
+PTXCONF_HOST_SYSTEM_BC=y
PTXCONF_HOST_SYSTEM_PYTHON3_FLIT_CORE=y
PTXCONF_HOST_SYSTEM_PYTHON3_INSTALLER=y
PTXCONF_HOST_SYSTEM_PYTHON3_PACKAGING=y
diff --git a/configs/platform-mipsel/platforms/kernel.in b/configs/platform-mipsel/platforms/kernel.in
deleted file mode 100644
index 1889211a7ae2..000000000000
--- a/configs/platform-mipsel/platforms/kernel.in
+++ /dev/null
@@ -1,26 +0,0 @@
-## SECTION=base_kernel
-
-menuconfig KERNEL
- bool
- default y
- prompt "Linux kernel "
-
-if KERNEL
-
-config KERNEL_VERSION
- prompt "kernel version"
- string
- default "4.15"
-
-config KERNEL_MD5
- prompt "kernel source md5sum"
- string
-
-config KERNEL_INSTALL
- bool
-
-config KERNEL_LZOP
- prompt "build lzop hosttool"
- bool
-
-endif # KERNEL
diff --git a/configs/platform-mipsel/rules/kernel.make b/configs/platform-mipsel/rules/kernel.make
deleted file mode 100644
index 6d5ca4d4ea0e..000000000000
--- a/configs/platform-mipsel/rules/kernel.make
+++ /dev/null
@@ -1,82 +0,0 @@
-# -*-makefile-*-
-#
-# Copyright (C) 2002-2009 by Pengutronix e.K., Hildesheim, Germany
-# 2010 by Marc Kleine-Budde <mkl@pengutronix.de>
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-PACKAGES-$(PTXCONF_KERNEL) += kernel
-
-#
-# Paths and names
-#
-KERNEL := linux-$(KERNEL_VERSION)
-KERNEL_MD5 := $(call remove_quotes,$(PTXCONF_KERNEL_MD5))
-ifneq ($(KERNEL_NEEDS_GIT_URL),y)
-KERNEL_SUFFIX := tar.xz
-KERNEL_URL := $(call kernel-url, KERNEL)
-else
-KERNEL_SUFFIX := tar.gz
-KERNEL_URL := https://git.kernel.org/torvalds/t/$(KERNEL).$(KERNEL_SUFFIX)
-endif
-KERNEL_DIR := $(BUILDDIR)/$(KERNEL)
-KERNEL_BUILD_DIR := $(KERNEL_DIR)-build
-KERNEL_CONFIG := $(call ptx/in-platformconfigdir, kernelconfig)
-KERNEL_LICENSE := GPL-2.0-only
-KERNEL_SOURCE := $(SRCDIR)/$(KERNEL).$(KERNEL_SUFFIX)
-KERNEL_DEVPKG := NO
-KERNEL_BUILD_OOT := KEEP
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-KERNEL_CONF_OPT := \
- -C $(KERNEL_DIR) \
- O=$(KERNEL_BUILD_DIR) \
- $(call kernel-opts, KERNEL)
-
-# no gcc plugins; avoid config changes depending on the host compiler
-KERNEL_CONF_OPT += \
- HOSTCXX=false
-
-ifdef PTXCONF_KERNEL
-$(KERNEL_CONFIG):
- @echo
- @echo "*************************************************************************"
- @echo "**** Please generate a kernelconfig with 'ptxdist menuconfig kernel' ****"
- @echo "*************************************************************************"
- @echo
- @echo
- @exit 1
-endif
-
-# ----------------------------------------------------------------------------
-# Compile
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/kernel.compile:
- @$(call targetinfo)
- @$(call touch)
-
-# ----------------------------------------------------------------------------
-# Install
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/kernel.install:
- @$(call targetinfo)
- @$(call touch)
-
-# ----------------------------------------------------------------------------
-# oldconfig / menuconfig
-# ----------------------------------------------------------------------------
-
-$(call ptx/kconfig-targets, kernel): $(STATEDIR)/kernel.extract
- @$(call world/kconfig, KERNEL, $(subst kernel_,,$@))
-
-# vim: syntax=make
diff --git a/configs/platform-mipsel/rules/kernel.noexec.make b/configs/platform-mipsel/rules/kernel.noexec.make
new file mode 100644
index 000000000000..df74af2c5b3d
--- /dev/null
+++ b/configs/platform-mipsel/rules/kernel.noexec.make
@@ -0,0 +1,2 @@
+# short-circuit the build since the recipe is only used to serve a REF_CONFIG
+KERNEL_MAKE_ENV=:
--
2.39.2
^ permalink raw reply [flat|nested] 20+ messages in thread
* [DistroKit] [PATCH v2 04/10] mips, mipsel: kernel-*: sync with template
2024-08-08 12:28 ` [DistroKit] [PATCH v2 01/10] mipsel: remove forked host-qemu rule Roland Hieber
2024-08-08 12:28 ` [DistroKit] [PATCH v2 02/10] mipsel: sync kernelconfig Roland Hieber
2024-08-08 12:28 ` [DistroKit] [PATCH v2 03/10] mips, mipsel: remove forked kernel rule Roland Hieber
@ 2024-08-08 12:28 ` Roland Hieber
2024-08-08 12:28 ` [DistroKit] [PATCH v2 05/10] mips, mipsel: kernel-*: use ptx/image-install and fix 'clean' stage Roland Hieber
` (6 subsequent siblings)
9 siblings, 0 replies; 20+ messages in thread
From: Roland Hieber @ 2024-08-08 12:28 UTC (permalink / raw)
To: distrokit; +Cc: Roland Hieber
Update the template-generated kernel rules by porting the following
PTXdist commits:
* ceb09a1f5e56 (2021-11-29, "template: kernel: avoid config changes based on availability of pahole")
* c49ffe4cd093 (2022-04-28, "kernel/kernel template: really allow subdirectories in KERNEL*_DTS")
* 208fe87261b8 (2022-04-28, "kernel template: make sure bc is available")
* 7205e52a301c (2023-09-12, "kernel: add make target for the installed device trees")
While at it, align the package variables.
Link: https://git.pengutronix.de/cgit/ptxdist/commit/?h=ceb09a1f5e56
Link: https://git.pengutronix.de/cgit/ptxdist/commit/?h=c49ffe4cd093
Link: https://git.pengutronix.de/cgit/ptxdist/commit/?h=208fe87261b8
Link: https://git.pengutronix.de/cgit/ptxdist/commit/?h=7205e52a301c
Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
.../platform-mips/platforms/kernel-ar9331.in | 1 +
.../platform-mips/platforms/kernel-malta.in | 1 +
.../platform-mips/rules/kernel-ar9331.make | 34 ++++++++-------
configs/platform-mips/rules/kernel-malta.make | 42 ++++++++++---------
configs/platform-mipsel/kernelconfig-malta | 2 +-
.../platform-mipsel/kernelconfig-malta.diff | 1 -
.../platform-mipsel/platforms/kernel-malta.in | 1 +
.../platform-mipsel/rules/kernel-malta.make | 37 +++++++++-------
8 files changed, 67 insertions(+), 52 deletions(-)
diff --git a/configs/platform-mips/platforms/kernel-ar9331.in b/configs/platform-mips/platforms/kernel-ar9331.in
index 51a28f94aee5..e7dd81f3e410 100644
--- a/configs/platform-mips/platforms/kernel-ar9331.in
+++ b/configs/platform-mips/platforms/kernel-ar9331.in
@@ -4,6 +4,7 @@ config KERNEL_AR9331
tristate
prompt "Linux kernel (ar9331)"
select HOST_LIBKMOD
+ select HOST_SYSTEM_BC
#select HOST_U_BOOT_TOOLS
help
FIXME
diff --git a/configs/platform-mips/platforms/kernel-malta.in b/configs/platform-mips/platforms/kernel-malta.in
index 8dcd50c8bde9..069ccceba301 100644
--- a/configs/platform-mips/platforms/kernel-malta.in
+++ b/configs/platform-mips/platforms/kernel-malta.in
@@ -4,6 +4,7 @@ config KERNEL_MALTA
tristate
prompt "Linux kernel (malta)"
select HOST_LIBKMOD
+ select HOST_SYSTEM_BC
#select HOST_U_BOOT_TOOLS
help
FIXME
diff --git a/configs/platform-mips/rules/kernel-ar9331.make b/configs/platform-mips/rules/kernel-ar9331.make
index 1ed0fa4f006d..0b3a3a1c3d33 100644
--- a/configs/platform-mips/rules/kernel-ar9331.make
+++ b/configs/platform-mips/rules/kernel-ar9331.make
@@ -14,23 +14,23 @@ PACKAGES-$(PTXCONF_KERNEL_AR9331) += kernel-ar9331
#
# Paths and names
#
-KERNEL_AR9331_VERSION := $(call ptx/config-version, PTXCONF_KERNEL)
-KERNEL_AR9331_MD5 := $(call ptx/config-md5, PTXCONF_KERNEL)
-KERNEL_AR9331 := linux-ar9331-$(KERNEL_AR9331_VERSION)
-KERNEL_AR9331_SUFFIX := tar.xz
-KERNEL_AR9331_URL := $(call kernel-url, KERNEL_AR9331)
-KERNEL_AR9331_PATCHES := linux-$(KERNEL_AR9331_VERSION)
-KERNEL_AR9331_SOURCE := $(SRCDIR)/$(KERNEL_AR9331_PATCHES).$(KERNEL_AR9331_SUFFIX)
-KERNEL_AR9331_DIR := $(BUILDDIR)/$(KERNEL_AR9331)
-KERNEL_AR9331_BUILD_DIR := $(KERNEL_AR9331_DIR)-build
-KERNEL_AR9331_CONFIG := $(call ptx/in-platformconfigdir, kernelconfig-ar9331)
+KERNEL_AR9331_VERSION := $(call ptx/config-version, PTXCONF_KERNEL)
+KERNEL_AR9331_MD5 := $(call ptx/config-md5, PTXCONF_KERNEL)
+KERNEL_AR9331 := linux-ar9331-$(KERNEL_AR9331_VERSION)
+KERNEL_AR9331_SUFFIX := tar.xz
+KERNEL_AR9331_URL := $(call kernel-url, KERNEL_AR9331)
+KERNEL_AR9331_PATCHES := linux-$(KERNEL_AR9331_VERSION)
+KERNEL_AR9331_SOURCE := $(SRCDIR)/$(KERNEL_AR9331_PATCHES).$(KERNEL_AR9331_SUFFIX)
+KERNEL_AR9331_DIR := $(BUILDDIR)/$(KERNEL_AR9331)
+KERNEL_AR9331_BUILD_DIR := $(KERNEL_AR9331_DIR)-build
+KERNEL_AR9331_CONFIG := $(call ptx/in-platformconfigdir, kernelconfig-ar9331)
KERNEL_AR9331_REF_CONFIG := $(call ptx/in-platformconfigdir, kernelconfig)
-KERNEL_AR9331_DTS_PATH := ${PTXDIST_PLATFORMCONFIG_SUBDIR}/dts:${KERNEL_AR9331_DIR}/arch/${GENERIC_KERNEL_ARCH}/boot/dts/qca
-KERNEL_AR9331_DTS := ar9331_dpt_module.dts
-KERNEL_AR9331_DTB_FILES := $(addsuffix .dtb,$(basename $(KERNEL_AR9331_DTS)))
-KERNEL_AR9331_LICENSE := GPL-2.0-only
+KERNEL_AR9331_DTS_PATH := ${PTXDIST_PLATFORMCONFIG_SUBDIR}/dts:${KERNEL_AR9331_DIR}/arch/${GENERIC_KERNEL_ARCH}/boot/dts
+KERNEL_AR9331_DTS := qca/ar9331_dpt_module.dts
+KERNEL_AR9331_DTB_FILES := $(addsuffix .dtb,$(basename $(notdir $(KERNEL_AR9331_DTS))))
+KERNEL_AR9331_LICENSE := GPL-2.0-only
KERNEL_AR9331_LICENSE_FILES :=
-KERNEL_AR9331_BUILD_OOT := KEEP
+KERNEL_AR9331_BUILD_OOT := KEEP
# track changes to devices-trees in the BSP
$(call world/dts-cfghash-file, KERNEL_AR9331)
@@ -107,6 +107,10 @@ $(STATEDIR)/kernel-ar9331.install:
# Target-Install
# ----------------------------------------------------------------------------
+ifneq ($(KERNEL_AR9331_DTB_FILES),)
+$(addprefix $(IMAGEDIR)/,$(KERNEL_AR9331_DTB_FILES)): $(STATEDIR)/kernel-ar9331.targetinstall
+endif
+
$(STATEDIR)/kernel-ar9331.targetinstall:
@$(call targetinfo)
diff --git a/configs/platform-mips/rules/kernel-malta.make b/configs/platform-mips/rules/kernel-malta.make
index e6116de830e2..8dc3ce79f5c2 100644
--- a/configs/platform-mips/rules/kernel-malta.make
+++ b/configs/platform-mips/rules/kernel-malta.make
@@ -14,23 +14,23 @@ PACKAGES-$(PTXCONF_KERNEL_MALTA) += kernel-malta
#
# Paths and names
#
-KERNEL_MALTA_VERSION := $(call ptx/config-version, PTXCONF_KERNEL)
-KERNEL_MALTA_MD5 := $(call ptx/config-md5, PTXCONF_KERNEL)
-KERNEL_MALTA := linux-malta-$(KERNEL_MALTA_VERSION)
-KERNEL_MALTA_SUFFIX := tar.xz
-KERNEL_MALTA_URL := $(call kernel-url, KERNEL_MALTA)
-KERNEL_MALTA_PATCHES := linux-$(KERNEL_MALTA_VERSION)
-KERNEL_MALTA_SOURCE := $(SRCDIR)/$(KERNEL_MALTA_PATCHES).$(KERNEL_MALTA_SUFFIX)
-KERNEL_MALTA_DIR := $(BUILDDIR)/$(KERNEL_MALTA)
-KERNEL_MALTA_BUILD_DIR := $(KERNEL_MALTA_DIR)-build
-KERNEL_MALTA_CONFIG := $(call ptx/in-platformconfigdir, kernelconfig-malta)
-KERNEL_MALTA_REF_CONFIG := $(call ptx/in-platformconfigdir, kernelconfig)
-KERNEL_MALTA_DTS_PATH := ${PTXDIST_PLATFORMCONFIG_SUBDIR}/dts:${KERNEL_MALTA_DIR}/arch/${GENERIC_KERNEL_ARCH}/boot/dts/mti
-KERNEL_MALTA_DTS := malta.dts
-KERNEL_MALTA_DTB_FILES := $(addsuffix .dtb,$(basename $(KERNEL_MALTA_DTS)))
-KERNEL_MALTA_LICENSE := GPL-2.0-only
+KERNEL_MALTA_VERSION := $(call ptx/config-version, PTXCONF_KERNEL)
+KERNEL_MALTA_MD5 := $(call ptx/config-md5, PTXCONF_KERNEL)
+KERNEL_MALTA := linux-malta-$(KERNEL_MALTA_VERSION)
+KERNEL_MALTA_SUFFIX := tar.xz
+KERNEL_MALTA_URL := $(call kernel-url, KERNEL_MALTA)
+KERNEL_MALTA_PATCHES := linux-$(KERNEL_MALTA_VERSION)
+KERNEL_MALTA_SOURCE := $(SRCDIR)/$(KERNEL_MALTA_PATCHES).$(KERNEL_MALTA_SUFFIX)
+KERNEL_MALTA_DIR := $(BUILDDIR)/$(KERNEL_MALTA)
+KERNEL_MALTA_BUILD_DIR := $(KERNEL_MALTA_DIR)-build
+KERNEL_MALTA_CONFIG := $(call ptx/in-platformconfigdir, kernelconfig-malta)
+KERNEL_MALTA_REF_CONFIG := $(call ptx/in-platformconfigdir, kernelconfig)
+KERNEL_MALTA_DTS_PATH := ${PTXDIST_PLATFORMCONFIG_SUBDIR}/dts:${KERNEL_MALTA_DIR}/arch/${GENERIC_KERNEL_ARCH}/boot/dts
+KERNEL_MALTA_DTS := mti/malta.dts
+KERNEL_MALTA_DTB_FILES := $(addsuffix .dtb,$(basename $(notdir $(KERNEL_MALTA_DTS))))
+KERNEL_MALTA_LICENSE := GPL-2.0-only
KERNEL_MALTA_LICENSE_FILES :=
-KERNEL_MALTA_BUILD_OOT := KEEP
+KERNEL_MALTA_BUILD_OOT := KEEP
# track changes to devices-trees in the BSP
$(call world/dts-cfghash-file, KERNEL_MALTA)
@@ -43,7 +43,7 @@ $(call world/dts-cfghash-file, KERNEL_MALTA)
KERNEL_MALTA_WRAPPER_BLACKLIST := \
$(PTXDIST_LOWLEVEL_WRAPPER_BLACKLIST)
-KERNEL_MALTA_PATH := PATH=$(CROSS_PATH)
+KERNEL_MALTA_PATH := PATH=$(CROSS_PATH)
KERNEL_MALTA_SHARED_OPT := \
-C $(KERNEL_MALTA_DIR) \
O=$(KERNEL_MALTA_BUILD_DIR) \
@@ -67,8 +67,8 @@ KERNEL_MALTA_CONF_OPT := \
#KERNEL_MALTA_CONF_OPT += \
# KERNELVERSION=$(KERNEL_MALTA_VERSION)
-KERNEL_MALTA_IMAGES := vmlinuz
-KERNEL_MALTA_IMAGES := $(addprefix $(KERNEL_MALTA_BUILD_DIR)/,$(KERNEL_MALTA_IMAGES))
+KERNEL_MALTA_IMAGES := vmlinuz
+KERNEL_MALTA_IMAGES := $(addprefix $(KERNEL_MALTA_BUILD_DIR)/,$(KERNEL_MALTA_IMAGES))
ifdef PTXCONF_KERNEL_MALTA
$(KERNEL_MALTA_CONFIG):
@@ -107,6 +107,10 @@ $(STATEDIR)/kernel-malta.install:
# Target-Install
# ----------------------------------------------------------------------------
+ifneq ($(KERNEL_MALTA_DTB_FILES),)
+$(addprefix $(IMAGEDIR)/,$(KERNEL_MALTA_DTB_FILES)): $(STATEDIR)/kernel-malta.targetinstall
+endif
+
$(STATEDIR)/kernel-malta.targetinstall:
@$(call targetinfo)
diff --git a/configs/platform-mipsel/kernelconfig-malta b/configs/platform-mipsel/kernelconfig-malta
index 6f73c6047892..5fdfd84df5ff 100644
--- a/configs/platform-mipsel/kernelconfig-malta
+++ b/configs/platform-mipsel/kernelconfig-malta
@@ -17,7 +17,7 @@ CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y
CONFIG_CC_HAS_ASM_INLINE=y
CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
-CONFIG_PAHOLE_VERSION=124
+CONFIG_PAHOLE_VERSION=0
CONFIG_IRQ_WORK=y
CONFIG_BUILDTIME_TABLE_SORT=y
diff --git a/configs/platform-mipsel/kernelconfig-malta.diff b/configs/platform-mipsel/kernelconfig-malta.diff
index 8e5b3352dedb..15b80d0fafd8 100644
--- a/configs/platform-mipsel/kernelconfig-malta.diff
+++ b/configs/platform-mipsel/kernelconfig-malta.diff
@@ -1109,7 +1109,6 @@ CONFIG_OF_MDIO=m
CONFIG_PAGE_POOL_STATS=y
CONFIG_PAGE_SIZE_16KB=y
# CONFIG_PAGE_SIZE_4KB is not set
-CONFIG_PAHOLE_VERSION=124
# CONFIG_PANIC_ON_OOPS is not set
CONFIG_PANIC_ON_OOPS_VALUE=0
CONFIG_PANIC_TIMEOUT=0
diff --git a/configs/platform-mipsel/platforms/kernel-malta.in b/configs/platform-mipsel/platforms/kernel-malta.in
index 8dcd50c8bde9..069ccceba301 100644
--- a/configs/platform-mipsel/platforms/kernel-malta.in
+++ b/configs/platform-mipsel/platforms/kernel-malta.in
@@ -4,6 +4,7 @@ config KERNEL_MALTA
tristate
prompt "Linux kernel (malta)"
select HOST_LIBKMOD
+ select HOST_SYSTEM_BC
#select HOST_U_BOOT_TOOLS
help
FIXME
diff --git a/configs/platform-mipsel/rules/kernel-malta.make b/configs/platform-mipsel/rules/kernel-malta.make
index 89f1e06c529a..8dc3ce79f5c2 100644
--- a/configs/platform-mipsel/rules/kernel-malta.make
+++ b/configs/platform-mipsel/rules/kernel-malta.make
@@ -14,23 +14,23 @@ PACKAGES-$(PTXCONF_KERNEL_MALTA) += kernel-malta
#
# Paths and names
#
-KERNEL_MALTA_VERSION := $(call ptx/config-version, PTXCONF_KERNEL)
-KERNEL_MALTA_MD5 := $(call ptx/config-md5, PTXCONF_KERNEL)
-KERNEL_MALTA := linux-malta-$(KERNEL_MALTA_VERSION)
-KERNEL_MALTA_SUFFIX := tar.xz
-KERNEL_MALTA_URL := $(call kernel-url, KERNEL_MALTA)
-KERNEL_MALTA_PATCHES := linux-$(KERNEL_MALTA_VERSION)
-KERNEL_MALTA_SOURCE := $(SRCDIR)/$(KERNEL_MALTA_PATCHES).$(KERNEL_MALTA_SUFFIX)
-KERNEL_MALTA_DIR := $(BUILDDIR)/$(KERNEL_MALTA)
-KERNEL_MALTA_BUILD_DIR := $(KERNEL_MALTA_DIR)-build
-KERNEL_MALTA_CONFIG := $(call ptx/in-platformconfigdir, kernelconfig-malta)
-KERNEL_MALTA_REF_CONFIG := $(call ptx/in-platformconfigdir, kernelconfig)
-KERNEL_MALTA_DTS_PATH := ${PTXDIST_PLATFORMCONFIG_SUBDIR}/dts:${KERNEL_MALTA_DIR}/arch/${GENERIC_KERNEL_ARCH}/boot/dts/mti
-KERNEL_MALTA_DTS := malta.dts
-KERNEL_MALTA_DTB_FILES := $(addsuffix .dtb,$(basename $(KERNEL_MALTA_DTS)))
-KERNEL_MALTA_LICENSE := GPL-2.0-only
+KERNEL_MALTA_VERSION := $(call ptx/config-version, PTXCONF_KERNEL)
+KERNEL_MALTA_MD5 := $(call ptx/config-md5, PTXCONF_KERNEL)
+KERNEL_MALTA := linux-malta-$(KERNEL_MALTA_VERSION)
+KERNEL_MALTA_SUFFIX := tar.xz
+KERNEL_MALTA_URL := $(call kernel-url, KERNEL_MALTA)
+KERNEL_MALTA_PATCHES := linux-$(KERNEL_MALTA_VERSION)
+KERNEL_MALTA_SOURCE := $(SRCDIR)/$(KERNEL_MALTA_PATCHES).$(KERNEL_MALTA_SUFFIX)
+KERNEL_MALTA_DIR := $(BUILDDIR)/$(KERNEL_MALTA)
+KERNEL_MALTA_BUILD_DIR := $(KERNEL_MALTA_DIR)-build
+KERNEL_MALTA_CONFIG := $(call ptx/in-platformconfigdir, kernelconfig-malta)
+KERNEL_MALTA_REF_CONFIG := $(call ptx/in-platformconfigdir, kernelconfig)
+KERNEL_MALTA_DTS_PATH := ${PTXDIST_PLATFORMCONFIG_SUBDIR}/dts:${KERNEL_MALTA_DIR}/arch/${GENERIC_KERNEL_ARCH}/boot/dts
+KERNEL_MALTA_DTS := mti/malta.dts
+KERNEL_MALTA_DTB_FILES := $(addsuffix .dtb,$(basename $(notdir $(KERNEL_MALTA_DTS))))
+KERNEL_MALTA_LICENSE := GPL-2.0-only
KERNEL_MALTA_LICENSE_FILES :=
-KERNEL_MALTA_BUILD_OOT := KEEP
+KERNEL_MALTA_BUILD_OOT := KEEP
# track changes to devices-trees in the BSP
$(call world/dts-cfghash-file, KERNEL_MALTA)
@@ -47,6 +47,7 @@ KERNEL_MALTA_PATH := PATH=$(CROSS_PATH)
KERNEL_MALTA_SHARED_OPT := \
-C $(KERNEL_MALTA_DIR) \
O=$(KERNEL_MALTA_BUILD_DIR) \
+ PAHOLE=false \
$(call kernel-opts, KERNEL_MALTA)
# no gcc plugins; avoid config changes depending on the host compiler
@@ -106,6 +107,10 @@ $(STATEDIR)/kernel-malta.install:
# Target-Install
# ----------------------------------------------------------------------------
+ifneq ($(KERNEL_MALTA_DTB_FILES),)
+$(addprefix $(IMAGEDIR)/,$(KERNEL_MALTA_DTB_FILES)): $(STATEDIR)/kernel-malta.targetinstall
+endif
+
$(STATEDIR)/kernel-malta.targetinstall:
@$(call targetinfo)
--
2.39.2
^ permalink raw reply [flat|nested] 20+ messages in thread
* [DistroKit] [PATCH v2 05/10] mips, mipsel: kernel-*: use ptx/image-install and fix 'clean' stage
2024-08-08 12:28 ` [DistroKit] [PATCH v2 01/10] mipsel: remove forked host-qemu rule Roland Hieber
` (2 preceding siblings ...)
2024-08-08 12:28 ` [DistroKit] [PATCH v2 04/10] mips, mipsel: kernel-*: sync with template Roland Hieber
@ 2024-08-08 12:28 ` Roland Hieber
2024-08-08 12:28 ` [DistroKit] [PATCH v2 06/10] mips, mipsel: kernel-*: select KERNEL Roland Hieber
` (5 subsequent siblings)
9 siblings, 0 replies; 20+ messages in thread
From: Roland Hieber @ 2024-08-08 12:28 UTC (permalink / raw)
To: distrokit; +Cc: Roland Hieber
The clean stage did not clean up the installed kernel images from the
image directory, but if we use ptx/image-install to install them, this
can all be done by PTXdist's default clean stage. That macro now also
prints the installed images, so we don't need to echo them.
Forwarded: https://lore.ptxdist.org/ptxdist/20240808093643.1634147-1-rhi@pengutronix.de
Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
.../platform-mips/rules/kernel-ar9331.make | 23 ++++++-------------
configs/platform-mips/rules/kernel-malta.make | 23 ++++++-------------
.../platform-mipsel/rules/kernel-malta.make | 23 ++++++-------------
3 files changed, 21 insertions(+), 48 deletions(-)
diff --git a/configs/platform-mips/rules/kernel-ar9331.make b/configs/platform-mips/rules/kernel-ar9331.make
index 0b3a3a1c3d33..a711e756118c 100644
--- a/configs/platform-mips/rules/kernel-ar9331.make
+++ b/configs/platform-mips/rules/kernel-ar9331.make
@@ -115,13 +115,14 @@ $(STATEDIR)/kernel-ar9331.targetinstall:
@$(call targetinfo)
@$(foreach image, $(KERNEL_AR9331_IMAGES), \
- install -v -m 644 $(image) \
- $(IMAGEDIR)/$(notdir $(image))-ar9331$(ptx/nl))
+ $(call ptx/image-install, KERNEL_AR9331, \
+ $(image), \
+ $(notdir $(image))-ar9331$(ptx/nl)))
- @$(foreach dtb ,$(KERNEL_AR9331_DTB_FILES), \
- echo -e "Installing $(dtb) ...\n"$(ptx/nl) \
- install -D -m0644 $(KERNEL_AR9331_PKGDIR)/boot/$(dtb) \
- $(IMAGEDIR)/$(dtb)$(ptx/nl))
+ @$(foreach dtb, $(KERNEL_AR9331_DTB_FILES), \
+ $(call ptx/image-install, KERNEL_AR9331, \
+ $(KERNEL_AR9331_PKGDIR)/boot/$(dtb), \
+ $(dtb)$(ptx/nl)))
@$(call install_init, kernel-ar9331)
@$(call install_fixup, kernel-ar9331, PRIORITY,optional)
@@ -143,16 +144,6 @@ $(STATEDIR)/kernel-ar9331.targetinstall:
@$(call touch)
-# ----------------------------------------------------------------------------
-# Clean
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/kernel-ar9331.clean:
- @$(call targetinfo)
- @$(call clean_pkg, KERNEL_AR9331)
- @$(foreach dtb,$(KERNEL_AR9331_DTB_FILES), \
- rm -vf $(IMAGEDIR)/$(dtb)$(ptx/nl))
-
# ----------------------------------------------------------------------------
# oldconfig / menuconfig
# ----------------------------------------------------------------------------
diff --git a/configs/platform-mips/rules/kernel-malta.make b/configs/platform-mips/rules/kernel-malta.make
index 8dc3ce79f5c2..badcff469994 100644
--- a/configs/platform-mips/rules/kernel-malta.make
+++ b/configs/platform-mips/rules/kernel-malta.make
@@ -115,13 +115,14 @@ $(STATEDIR)/kernel-malta.targetinstall:
@$(call targetinfo)
@$(foreach image, $(KERNEL_MALTA_IMAGES), \
- install -v -m 644 $(image) \
- $(IMAGEDIR)/$(notdir $(image))-malta$(ptx/nl))
+ $(call ptx/image-install, KERNEL_MALTA, \
+ $(image), \
+ $(notdir $(image))-malta$(ptx/nl)))
- @$(foreach dtb ,$(KERNEL_MALTA_DTB_FILES), \
- echo -e "Installing $(dtb) ...\n"$(ptx/nl) \
- install -D -m0644 $(KERNEL_MALTA_PKGDIR)/boot/$(dtb) \
- $(IMAGEDIR)/$(dtb)$(ptx/nl))
+ @$(foreach dtb, $(KERNEL_MALTA_DTB_FILES), \
+ $(call ptx/image-install, KERNEL_MALTA, \
+ $(KERNEL_MALTA_PKGDIR)/boot/$(dtb), \
+ $(dtb)$(ptx/nl)))
@$(call install_init, kernel-malta)
@$(call install_fixup, kernel-malta, PRIORITY,optional)
@@ -143,16 +144,6 @@ $(STATEDIR)/kernel-malta.targetinstall:
@$(call touch)
-# ----------------------------------------------------------------------------
-# Clean
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/kernel-malta.clean:
- @$(call targetinfo)
- @$(call clean_pkg, KERNEL_MALTA)
- @$(foreach dtb,$(KERNEL_MALTA_DTB_FILES), \
- rm -vf $(IMAGEDIR)/$(dtb)$(ptx/nl))
-
# ----------------------------------------------------------------------------
# oldconfig / menuconfig
# ----------------------------------------------------------------------------
diff --git a/configs/platform-mipsel/rules/kernel-malta.make b/configs/platform-mipsel/rules/kernel-malta.make
index 8dc3ce79f5c2..badcff469994 100644
--- a/configs/platform-mipsel/rules/kernel-malta.make
+++ b/configs/platform-mipsel/rules/kernel-malta.make
@@ -115,13 +115,14 @@ $(STATEDIR)/kernel-malta.targetinstall:
@$(call targetinfo)
@$(foreach image, $(KERNEL_MALTA_IMAGES), \
- install -v -m 644 $(image) \
- $(IMAGEDIR)/$(notdir $(image))-malta$(ptx/nl))
+ $(call ptx/image-install, KERNEL_MALTA, \
+ $(image), \
+ $(notdir $(image))-malta$(ptx/nl)))
- @$(foreach dtb ,$(KERNEL_MALTA_DTB_FILES), \
- echo -e "Installing $(dtb) ...\n"$(ptx/nl) \
- install -D -m0644 $(KERNEL_MALTA_PKGDIR)/boot/$(dtb) \
- $(IMAGEDIR)/$(dtb)$(ptx/nl))
+ @$(foreach dtb, $(KERNEL_MALTA_DTB_FILES), \
+ $(call ptx/image-install, KERNEL_MALTA, \
+ $(KERNEL_MALTA_PKGDIR)/boot/$(dtb), \
+ $(dtb)$(ptx/nl)))
@$(call install_init, kernel-malta)
@$(call install_fixup, kernel-malta, PRIORITY,optional)
@@ -143,16 +144,6 @@ $(STATEDIR)/kernel-malta.targetinstall:
@$(call touch)
-# ----------------------------------------------------------------------------
-# Clean
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/kernel-malta.clean:
- @$(call targetinfo)
- @$(call clean_pkg, KERNEL_MALTA)
- @$(foreach dtb,$(KERNEL_MALTA_DTB_FILES), \
- rm -vf $(IMAGEDIR)/$(dtb)$(ptx/nl))
-
# ----------------------------------------------------------------------------
# oldconfig / menuconfig
# ----------------------------------------------------------------------------
--
2.39.2
^ permalink raw reply [flat|nested] 20+ messages in thread
* [DistroKit] [PATCH v2 06/10] mips, mipsel: kernel-*: select KERNEL
2024-08-08 12:28 ` [DistroKit] [PATCH v2 01/10] mipsel: remove forked host-qemu rule Roland Hieber
` (3 preceding siblings ...)
2024-08-08 12:28 ` [DistroKit] [PATCH v2 05/10] mips, mipsel: kernel-*: use ptx/image-install and fix 'clean' stage Roland Hieber
@ 2024-08-08 12:28 ` Roland Hieber
2024-08-08 13:41 ` Michael Olbrich
2024-08-08 12:28 ` [DistroKit] [PATCH v2 07/10] mips, mipsel: migrate barebox-common recipe to barebox Roland Hieber
` (4 subsequent siblings)
9 siblings, 1 reply; 20+ messages in thread
From: Roland Hieber @ 2024-08-08 12:28 UTC (permalink / raw)
To: distrokit; +Cc: Roland Hieber
We're using PTXCONF_KERNEL_VERSION and PTXCONF_KERNEL_MD5 in our rules,
which are only defined when KERNEL is selected.
Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
configs/platform-mips/platforms/kernel-ar9331.in | 1 +
configs/platform-mips/platforms/kernel-malta.in | 1 +
configs/platform-mipsel/platforms/kernel-malta.in | 1 +
3 files changed, 3 insertions(+)
diff --git a/configs/platform-mips/platforms/kernel-ar9331.in b/configs/platform-mips/platforms/kernel-ar9331.in
index e7dd81f3e410..47f8ac8e7a85 100644
--- a/configs/platform-mips/platforms/kernel-ar9331.in
+++ b/configs/platform-mips/platforms/kernel-ar9331.in
@@ -6,5 +6,6 @@ config KERNEL_AR9331
select HOST_LIBKMOD
select HOST_SYSTEM_BC
#select HOST_U_BOOT_TOOLS
+ select KERNEL
help
FIXME
diff --git a/configs/platform-mips/platforms/kernel-malta.in b/configs/platform-mips/platforms/kernel-malta.in
index 069ccceba301..92a22d0ca090 100644
--- a/configs/platform-mips/platforms/kernel-malta.in
+++ b/configs/platform-mips/platforms/kernel-malta.in
@@ -6,5 +6,6 @@ config KERNEL_MALTA
select HOST_LIBKMOD
select HOST_SYSTEM_BC
#select HOST_U_BOOT_TOOLS
+ select KERNEL
help
FIXME
diff --git a/configs/platform-mipsel/platforms/kernel-malta.in b/configs/platform-mipsel/platforms/kernel-malta.in
index 069ccceba301..92a22d0ca090 100644
--- a/configs/platform-mipsel/platforms/kernel-malta.in
+++ b/configs/platform-mipsel/platforms/kernel-malta.in
@@ -6,5 +6,6 @@ config KERNEL_MALTA
select HOST_LIBKMOD
select HOST_SYSTEM_BC
#select HOST_U_BOOT_TOOLS
+ select KERNEL
help
FIXME
--
2.39.2
^ permalink raw reply [flat|nested] 20+ messages in thread
* [DistroKit] [PATCH v2 07/10] mips, mipsel: migrate barebox-common recipe to barebox
2024-08-08 12:28 ` [DistroKit] [PATCH v2 01/10] mipsel: remove forked host-qemu rule Roland Hieber
` (4 preceding siblings ...)
2024-08-08 12:28 ` [DistroKit] [PATCH v2 06/10] mips, mipsel: kernel-*: select KERNEL Roland Hieber
@ 2024-08-08 12:28 ` Roland Hieber
2024-08-08 12:28 ` [DistroKit] [PATCH v2 08/10] mips, mipsel: barebox-*: sync with template Roland Hieber
` (3 subsequent siblings)
9 siblings, 0 replies; 20+ messages in thread
From: Roland Hieber @ 2024-08-08 12:28 UTC (permalink / raw)
To: distrokit; +Cc: Roland Hieber
With a bit of hackery in barebox.noexec.make, we can use the upstream
barebox package to provide a REF_CONFIG for the other barebox packages.
The slight disadvantage is that its targetinstall stage creates an empty
barebox-default-environment file in the image folder, but the big
advantage is that we can save maintaining a custom rule.
Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
configs/platform-mips/platformconfig | 30 +++++--
.../platforms/barebox-0-common.in | 33 --------
.../platform-mips/platforms/barebox-ar9331.in | 2 +-
.../platform-mips/platforms/barebox-malta.in | 2 +-
.../platform-mips/rules/barebox-ar9331.make | 4 +-
.../platform-mips/rules/barebox-common.make | 84 -------------------
.../platform-mips/rules/barebox-malta.make | 4 +-
.../platform-mips/rules/barebox.noexec.make | 7 ++
configs/platform-mipsel/platformconfig | 30 +++++--
.../platforms/barebox-0-common.in | 33 --------
.../platforms/barebox-malta.in | 2 +-
.../platform-mipsel/rules/barebox-common.make | 84 -------------------
.../platform-mipsel/rules/barebox-malta.make | 4 +-
.../platform-mipsel/rules/barebox.noexec.make | 7 ++
14 files changed, 71 insertions(+), 255 deletions(-)
delete mode 100644 configs/platform-mips/platforms/barebox-0-common.in
delete mode 100644 configs/platform-mips/rules/barebox-common.make
create mode 100644 configs/platform-mips/rules/barebox.noexec.make
delete mode 100644 configs/platform-mipsel/platforms/barebox-0-common.in
delete mode 100644 configs/platform-mipsel/rules/barebox-common.make
create mode 100644 configs/platform-mipsel/rules/barebox.noexec.make
diff --git a/configs/platform-mips/platformconfig b/configs/platform-mips/platformconfig
index 6a7cab8ef6a7..fc7b10c2587b 100644
--- a/configs/platform-mips/platformconfig
+++ b/configs/platform-mips/platformconfig
@@ -170,16 +170,34 @@ PTXCONF_KERNEL_MALTA=y
# bootloaders
#
# PTXCONF_AT91BOOTSTRAP2 is not set
-PTXCONF_BAREBOX_COMMON_ARCH_STRING="mips"
-PTXCONF_BAREBOX_COMMON=y
-PTXCONF_BAREBOX_COMMON_VERSION="2021.02.0"
-PTXCONF_BAREBOX_COMMON_MD5="07045e34faa1135d9cd18503186b2d7f"
-PTXCONF_BAREBOX_COMMON_NEEDS_HOST_LZOP=y
PTXCONF_BAREBOX_AR9331=y
PTXCONF_BAREBOX_MALTA=y
PTXCONF_BAREBOX_ARCH_STRING="mips"
-# PTXCONF_BAREBOX is not set
+PTXCONF_BAREBOX_DEPENDENCIES=y
+PTXCONF_BAREBOX=y
+PTXCONF_BAREBOX_VERSION="2021.02.0"
+# PTXCONF_BAREBOX_CONFIG_BUILDSYSTEM_VERSION is not set
+PTXCONF_BAREBOX_MD5="07045e34faa1135d9cd18503186b2d7f"
+PTXCONF_BAREBOX_CONFIG="barebox.config"
+# PTXCONF_BAREBOX_FIRMWARE is not set
+# PTXCONF_BAREBOX_EXTRA_ENV is not set
+# PTXCONF_BAREBOX_BAREBOXENV is not set
+# PTXCONF_BAREBOX_INSTALL_DTBS is not set
+# PTXCONF_BAREBOX_BAREBOXCRC32 is not set
+# PTXCONF_BAREBOX_KERNEL_INSTALL is not set
+# PTXCONF_BAREBOX_BAREBOXIMD is not set
+
+#
+# build dependencies
+#
+# PTXCONF_BAREBOX_NEEDS_HOST_LIBUSB is not set
+# PTXCONF_BAREBOX_NEEDS_HOST_OPENSSL is not set
+# PTXCONF_BAREBOX_NEEDS_HOST_IMX_CST is not set
+# PTXCONF_BAREBOX_NEEDS_KEYS is not set
+PTXCONF_BAREBOX_NEEDS_HOST_LZOP=y
+# PTXCONF_BAREBOX_NEEDS_HOST_LZ4 is not set
# PTXCONF_BAREBOX_MLO is not set
+PTXCONF_BOOTLOADER=y
# PTXCONF_GRUB is not set
# PTXCONF_HOST_MXS_UTILS is not set
# PTXCONF_U_BOOT is not set
diff --git a/configs/platform-mips/platforms/barebox-0-common.in b/configs/platform-mips/platforms/barebox-0-common.in
deleted file mode 100644
index 0b487ba3bdea..000000000000
--- a/configs/platform-mips/platforms/barebox-0-common.in
+++ /dev/null
@@ -1,33 +0,0 @@
-## SECTION=bootloader
-
-config BAREBOX_COMMON_ARCH_STRING
- string
- default "mips"
-
-menuconfig BAREBOX_COMMON
- prompt "common barebox options "
- bool
- select HOST_LZOP if BAREBOX_COMMON_NEEDS_HOST_LZOP
- help
- A metapackage serving a reference config for all other barebox
- variants in the v7a platform. It doesn't install anything.
-
-if BAREBOX_COMMON
-
-config BAREBOX_COMMON_VERSION
- prompt "barebox version"
- string
- default "2016.08.0"
-
-config BAREBOX_COMMON_MD5
- prompt "barebox source md5sum"
- string
-
-config BAREBOX_COMMON_NEEDS_HOST_LZOP
- prompt "barebox needs lzop"
- bool
- help
- The barebox binaries can be compressed. Select this if lzop
- is used in order to compile lzop for your development host.
-
-endif
diff --git a/configs/platform-mips/platforms/barebox-ar9331.in b/configs/platform-mips/platforms/barebox-ar9331.in
index b54fc44693c0..5f22bd160fd0 100644
--- a/configs/platform-mips/platforms/barebox-ar9331.in
+++ b/configs/platform-mips/platforms/barebox-ar9331.in
@@ -3,6 +3,6 @@
config BAREBOX_AR9331
tristate
prompt "Barebox (ar9331)"
- select BAREBOX_COMMON
+ select BAREBOX
help
MIPS Malta support for barebox.
diff --git a/configs/platform-mips/platforms/barebox-malta.in b/configs/platform-mips/platforms/barebox-malta.in
index 6976a961f31d..3388a67c13dc 100644
--- a/configs/platform-mips/platforms/barebox-malta.in
+++ b/configs/platform-mips/platforms/barebox-malta.in
@@ -3,6 +3,6 @@
config BAREBOX_MALTA
tristate
prompt "Barebox (malta)"
- select BAREBOX_COMMON
+ select BAREBOX
help
MIPS Malta support for barebox.
diff --git a/configs/platform-mips/rules/barebox-ar9331.make b/configs/platform-mips/rules/barebox-ar9331.make
index 3cc949555f75..c769d2111978 100644
--- a/configs/platform-mips/rules/barebox-ar9331.make
+++ b/configs/platform-mips/rules/barebox-ar9331.make
@@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_BAREBOX_AR9331) += barebox-ar9331
#
# Paths and names
#
-BAREBOX_AR9331_VERSION := $(call ptx/config-version, PTXCONF_BAREBOX_COMMON)
-BAREBOX_AR9331_MD5 := $(call ptx/config-md5, PTXCONF_BAREBOX_COMMON)
+BAREBOX_AR9331_VERSION := $(call ptx/config-version, PTXCONF_BAREBOX)
+BAREBOX_AR9331_MD5 := $(call ptx/config-md5, PTXCONF_BAREBOX)
BAREBOX_AR9331 := barebox-ar9331-$(BAREBOX_AR9331_VERSION)
BAREBOX_AR9331_SUFFIX := tar.bz2
BAREBOX_AR9331_URL := $(call barebox-url, BAREBOX_AR9331)
diff --git a/configs/platform-mips/rules/barebox-common.make b/configs/platform-mips/rules/barebox-common.make
deleted file mode 100644
index 4411dbebd35f..000000000000
--- a/configs/platform-mips/rules/barebox-common.make
+++ /dev/null
@@ -1,84 +0,0 @@
-# -*-makefile-*-
-#
-# Copyright (C) 2019 Roland Hieber <rhi@pengutronix.de>
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-PACKAGES-$(PTXCONF_BAREBOX_COMMON) += barebox-common
-
-#
-# Paths and names
-#
-BAREBOX_COMMON_VERSION := $(call ptx/config-version, PTXCONF_BAREBOX_COMMON)
-BAREBOX_COMMON_MD5 := $(call ptx/config-md5, PTXCONF_BAREBOX_COMMON)
-BAREBOX_COMMON := barebox-common-$(BAREBOX_COMMON_VERSION)
-BAREBOX_COMMON_SUFFIX := tar.bz2
-BAREBOX_COMMON_URL := $(call barebox-url, BAREBOX_COMMON)
-BAREBOX_COMMON_PATCHES := barebox-$(BAREBOX_COMMON_VERSION)
-BAREBOX_COMMON_SOURCE := $(SRCDIR)/$(BAREBOX_COMMON_PATCHES).$(BAREBOX_COMMON_SUFFIX)
-BAREBOX_COMMON_DIR := $(BUILDDIR)/$(BAREBOX_COMMON)
-BAREBOX_COMMON_BUILD_DIR := $(BAREBOX_COMMON_DIR)-build
-BAREBOX_COMMON_CONFIG := $(call ptx/in-platformconfigdir, barebox.config)
-BAREBOX_COMMON_LICENSE := GPL-2.0-only
-BAREBOX_COMMON_BUILD_OOT := KEEP
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-# use host pkg-config for host tools
-BAREBOX_COMMON_PATH := PATH=$(HOST_PATH)
-
-BAREBOX_COMMON_CONF_OPT := \
- -C $(BAREBOX_COMMON_DIR) \
- O=$(BAREBOX_COMMON_BUILD_DIR) \
- BUILDSYSTEM_VERSION=$(PTXDIST_VCS_VERSION) \
- $(call barebox-opts, BAREBOX_COMMON)
-
-BAREBOX_COMMON_MAKE_OPT := $(BAREBOX_COMMON_CONF_OPT)
-
-BAREBOX_COMMON_TAGS_OPT := TAGS tags cscope
-
-ifdef PTXCONF_BAREBOX_COMMON
-$(BAREBOX_COMMON_CONFIG):
- @echo
- @echo "****************************************************************************"
- @echo " Please generate a bareboxconfig with 'ptxdist menuconfig barebox-common'"
- @echo "****************************************************************************"
- @echo
- @echo
- @exit 1
-endif
-
-# ----------------------------------------------------------------------------
-# Compile
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/barebox-common.compile:
- @$(call targetinfo)
- @$(call touch)
-
-# ----------------------------------------------------------------------------
-# Install
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/barebox-common.install:
- @$(call targetinfo)
- @$(call touch)
-
-# ----------------------------------------------------------------------------
-# oldconfig / menuconfig
-# ----------------------------------------------------------------------------
-
-barebox-common_menuconfig barebox-common_nconfig: $(STATEDIR)/barebox-common.extract
- @$(call world/kconfig, BAREBOX_COMMON, $(subst barebox-common_,,$@))
-
-barebox-common_do_oldconfig: $(STATEDIR)/barebox-common.extract
- @$(call world/kconfig, BAREBOX_COMMON, oldconfig)
-
-# vim: syntax=make
diff --git a/configs/platform-mips/rules/barebox-malta.make b/configs/platform-mips/rules/barebox-malta.make
index 31b0b066e332..ae4dcfe8d6e4 100644
--- a/configs/platform-mips/rules/barebox-malta.make
+++ b/configs/platform-mips/rules/barebox-malta.make
@@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_BAREBOX_MALTA) += barebox-malta
#
# Paths and names
#
-BAREBOX_MALTA_VERSION := $(call ptx/config-version, PTXCONF_BAREBOX_COMMON)
-BAREBOX_MALTA_MD5 := $(call ptx/config-md5, PTXCONF_BAREBOX_COMMON)
+BAREBOX_MALTA_VERSION := $(call ptx/config-version, PTXCONF_BAREBOX)
+BAREBOX_MALTA_MD5 := $(call ptx/config-md5, PTXCONF_BAREBOX)
BAREBOX_MALTA := barebox-malta-$(BAREBOX_MALTA_VERSION)
BAREBOX_MALTA_SUFFIX := tar.bz2
BAREBOX_MALTA_URL := $(call barebox-url, BAREBOX_MALTA)
diff --git a/configs/platform-mips/rules/barebox.noexec.make b/configs/platform-mips/rules/barebox.noexec.make
new file mode 100644
index 000000000000..76b4a4f78126
--- /dev/null
+++ b/configs/platform-mips/rules/barebox.noexec.make
@@ -0,0 +1,7 @@
+# short-circuit the build since the recipe is only used to serve a REF_CONFIG
+BAREBOX_MAKE_ENV=:
+
+# don't error out when trying to copy the defaultenv in the targetinstall stage
+$(STATEDIR)/barebox.targetinstall: $(BAREBOX_BUILD_DIR)/defaultenv/barebox_zero_env
+$(BAREBOX_BUILD_DIR)/defaultenv/barebox_zero_env: $(STATEDIR)/barebox.compile
+ mkdir -p "$(dir $@)" && touch $@
diff --git a/configs/platform-mipsel/platformconfig b/configs/platform-mipsel/platformconfig
index d69bab59bdd1..e71cbcd27f71 100644
--- a/configs/platform-mipsel/platformconfig
+++ b/configs/platform-mipsel/platformconfig
@@ -169,15 +169,33 @@ PTXCONF_KERNEL_MALTA=y
# bootloaders
#
# PTXCONF_AT91BOOTSTRAP2 is not set
-PTXCONF_BAREBOX_COMMON_ARCH_STRING="mips"
-PTXCONF_BAREBOX_COMMON=y
-PTXCONF_BAREBOX_COMMON_VERSION="2021.06.0"
-PTXCONF_BAREBOX_COMMON_MD5="62d995d4b70c7007800e688ac6ca80df"
-PTXCONF_BAREBOX_COMMON_NEEDS_HOST_LZOP=y
PTXCONF_BAREBOX_MALTA=y
PTXCONF_BAREBOX_ARCH_STRING="mips"
-# PTXCONF_BAREBOX is not set
+PTXCONF_BAREBOX_DEPENDENCIES=y
+PTXCONF_BAREBOX=y
+PTXCONF_BAREBOX_VERSION="2021.06.0"
+# PTXCONF_BAREBOX_CONFIG_BUILDSYSTEM_VERSION is not set
+PTXCONF_BAREBOX_MD5="62d995d4b70c7007800e688ac6ca80df"
+PTXCONF_BAREBOX_CONFIG="barebox.config"
+# PTXCONF_BAREBOX_FIRMWARE is not set
+# PTXCONF_BAREBOX_EXTRA_ENV is not set
+# PTXCONF_BAREBOX_BAREBOXENV is not set
+# PTXCONF_BAREBOX_INSTALL_DTBS is not set
+# PTXCONF_BAREBOX_BAREBOXCRC32 is not set
+# PTXCONF_BAREBOX_KERNEL_INSTALL is not set
+# PTXCONF_BAREBOX_BAREBOXIMD is not set
+
+#
+# build dependencies
+#
+# PTXCONF_BAREBOX_NEEDS_HOST_LIBUSB is not set
+# PTXCONF_BAREBOX_NEEDS_HOST_OPENSSL is not set
+# PTXCONF_BAREBOX_NEEDS_HOST_IMX_CST is not set
+# PTXCONF_BAREBOX_NEEDS_KEYS is not set
+PTXCONF_BAREBOX_NEEDS_HOST_LZOP=y
+# PTXCONF_BAREBOX_NEEDS_HOST_LZ4 is not set
# PTXCONF_BAREBOX_MLO is not set
+PTXCONF_BOOTLOADER=y
# PTXCONF_GRUB is not set
# PTXCONF_HOST_MXS_UTILS is not set
# PTXCONF_U_BOOT is not set
diff --git a/configs/platform-mipsel/platforms/barebox-0-common.in b/configs/platform-mipsel/platforms/barebox-0-common.in
deleted file mode 100644
index 0b487ba3bdea..000000000000
--- a/configs/platform-mipsel/platforms/barebox-0-common.in
+++ /dev/null
@@ -1,33 +0,0 @@
-## SECTION=bootloader
-
-config BAREBOX_COMMON_ARCH_STRING
- string
- default "mips"
-
-menuconfig BAREBOX_COMMON
- prompt "common barebox options "
- bool
- select HOST_LZOP if BAREBOX_COMMON_NEEDS_HOST_LZOP
- help
- A metapackage serving a reference config for all other barebox
- variants in the v7a platform. It doesn't install anything.
-
-if BAREBOX_COMMON
-
-config BAREBOX_COMMON_VERSION
- prompt "barebox version"
- string
- default "2016.08.0"
-
-config BAREBOX_COMMON_MD5
- prompt "barebox source md5sum"
- string
-
-config BAREBOX_COMMON_NEEDS_HOST_LZOP
- prompt "barebox needs lzop"
- bool
- help
- The barebox binaries can be compressed. Select this if lzop
- is used in order to compile lzop for your development host.
-
-endif
diff --git a/configs/platform-mipsel/platforms/barebox-malta.in b/configs/platform-mipsel/platforms/barebox-malta.in
index 6976a961f31d..3388a67c13dc 100644
--- a/configs/platform-mipsel/platforms/barebox-malta.in
+++ b/configs/platform-mipsel/platforms/barebox-malta.in
@@ -3,6 +3,6 @@
config BAREBOX_MALTA
tristate
prompt "Barebox (malta)"
- select BAREBOX_COMMON
+ select BAREBOX
help
MIPS Malta support for barebox.
diff --git a/configs/platform-mipsel/rules/barebox-common.make b/configs/platform-mipsel/rules/barebox-common.make
deleted file mode 100644
index d0caead4ac40..000000000000
--- a/configs/platform-mipsel/rules/barebox-common.make
+++ /dev/null
@@ -1,84 +0,0 @@
-# -*-makefile-*-
-#
-# Copyright (C) 2019 Roland Hieber <rhi@pengutronix.de>
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-PACKAGES-$(PTXCONF_BAREBOX_COMMON) += barebox-common
-
-#
-# Paths and names
-#
-BAREBOX_COMMON_VERSION := $(call remove_quotes,$(PTXCONF_BAREBOX_COMMON_VERSION))
-BAREBOX_COMMON_MD5 := $(call remove_quotes,$(PTXCONF_BAREBOX_COMMON_MD5))
-BAREBOX_COMMON := barebox-common-$(BAREBOX_COMMON_VERSION)
-BAREBOX_COMMON_SUFFIX := tar.bz2
-BAREBOX_COMMON_URL := $(call barebox-url, BAREBOX_COMMON)
-BAREBOX_COMMON_PATCHES := barebox-$(BAREBOX_COMMON_VERSION)
-BAREBOX_COMMON_SOURCE := $(SRCDIR)/$(BAREBOX_COMMON_PATCHES).$(BAREBOX_COMMON_SUFFIX)
-BAREBOX_COMMON_DIR := $(BUILDDIR)/$(BAREBOX_COMMON)
-BAREBOX_COMMON_BUILD_DIR := $(BAREBOX_COMMON_DIR)-build
-BAREBOX_COMMON_CONFIG := $(call ptx/in-platformconfigdir, barebox.config)
-BAREBOX_COMMON_LICENSE := GPL-2.0-only
-BAREBOX_COMMON_BUILD_OOT := KEEP
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-# use host pkg-config for host tools
-BAREBOX_COMMON_PATH := PATH=$(HOST_PATH)
-
-BAREBOX_COMMON_CONF_OPT := \
- -C $(BAREBOX_COMMON_DIR) \
- O=$(BAREBOX_COMMON_BUILD_DIR) \
- BUILDSYSTEM_VERSION=$(PTXDIST_VCS_VERSION) \
- $(call barebox-opts, BAREBOX_COMMON)
-
-BAREBOX_COMMON_MAKE_OPT := $(BAREBOX_COMMON_CONF_OPT)
-
-BAREBOX_COMMON_TAGS_OPT := TAGS tags cscope
-
-ifdef PTXCONF_BAREBOX_COMMON
-$(BAREBOX_COMMON_CONFIG):
- @echo
- @echo "****************************************************************************"
- @echo " Please generate a bareboxconfig with 'ptxdist menuconfig barebox-common'"
- @echo "****************************************************************************"
- @echo
- @echo
- @exit 1
-endif
-
-# ----------------------------------------------------------------------------
-# Compile
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/barebox-common.compile:
- @$(call targetinfo)
- @$(call touch)
-
-# ----------------------------------------------------------------------------
-# Install
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/barebox-common.install:
- @$(call targetinfo)
- @$(call touch)
-
-# ----------------------------------------------------------------------------
-# oldconfig / menuconfig
-# ----------------------------------------------------------------------------
-
-barebox-common_menuconfig barebox-common_nconfig: $(STATEDIR)/barebox-common.extract
- @$(call world/kconfig, BAREBOX_COMMON, $(subst barebox-common_,,$@))
-
-barebox-common_do_oldconfig: $(STATEDIR)/barebox-common.extract
- @$(call world/kconfig, BAREBOX_COMMON, oldconfig)
-
-# vim: syntax=make
diff --git a/configs/platform-mipsel/rules/barebox-malta.make b/configs/platform-mipsel/rules/barebox-malta.make
index d9a63fa13fbf..ec40264bdc48 100644
--- a/configs/platform-mipsel/rules/barebox-malta.make
+++ b/configs/platform-mipsel/rules/barebox-malta.make
@@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_BAREBOX_MALTA) += barebox-malta
#
# Paths and names
#
-BAREBOX_MALTA_VERSION := $(call remove_quotes,$(PTXCONF_BAREBOX_COMMON_VERSION))
-BAREBOX_MALTA_MD5 := $(call remove_quotes,$(PTXCONF_BAREBOX_COMMON_MD5))
+BAREBOX_MALTA_VERSION := $(call remove_quotes,$(PTXCONF_BAREBOX_VERSION))
+BAREBOX_MALTA_MD5 := $(call remove_quotes,$(PTXCONF_BAREBOX_MD5))
BAREBOX_MALTA := barebox-malta-$(BAREBOX_MALTA_VERSION)
BAREBOX_MALTA_SUFFIX := tar.bz2
BAREBOX_MALTA_URL := $(call barebox-url, BAREBOX_MALTA)
diff --git a/configs/platform-mipsel/rules/barebox.noexec.make b/configs/platform-mipsel/rules/barebox.noexec.make
new file mode 100644
index 000000000000..76b4a4f78126
--- /dev/null
+++ b/configs/platform-mipsel/rules/barebox.noexec.make
@@ -0,0 +1,7 @@
+# short-circuit the build since the recipe is only used to serve a REF_CONFIG
+BAREBOX_MAKE_ENV=:
+
+# don't error out when trying to copy the defaultenv in the targetinstall stage
+$(STATEDIR)/barebox.targetinstall: $(BAREBOX_BUILD_DIR)/defaultenv/barebox_zero_env
+$(BAREBOX_BUILD_DIR)/defaultenv/barebox_zero_env: $(STATEDIR)/barebox.compile
+ mkdir -p "$(dir $@)" && touch $@
--
2.39.2
^ permalink raw reply [flat|nested] 20+ messages in thread
* [DistroKit] [PATCH v2 08/10] mips, mipsel: barebox-*: sync with template
2024-08-08 12:28 ` [DistroKit] [PATCH v2 01/10] mipsel: remove forked host-qemu rule Roland Hieber
` (5 preceding siblings ...)
2024-08-08 12:28 ` [DistroKit] [PATCH v2 07/10] mips, mipsel: migrate barebox-common recipe to barebox Roland Hieber
@ 2024-08-08 12:28 ` Roland Hieber
2024-08-08 12:28 ` [DistroKit] [PATCH v2 09/10] mips, mipsel: barebox-*: use ptx/image-install Roland Hieber
` (2 subsequent siblings)
9 siblings, 0 replies; 20+ messages in thread
From: Roland Hieber @ 2024-08-08 12:28 UTC (permalink / raw)
To: distrokit; +Cc: Roland Hieber
Update the template-generated barebox rules to port the following
PTXdist commits:
* b0f9f2fe33ca (2020-08-07, Roland Hieber: "barebox, kernel: enable use of {allyes, allno, allmod, alldef, rand}config")
* 682d95986b7a (2020-08-19, Roland Hieber: "barebox, kernel: set <PKG>_CONF_TOOL := kconfig explicitely")
* 5af76a1c7d63 (2020-08-19, Roland Hieber: "barebox, kernel: tab-align variables")
* 7fa9235fb915 (2020-10-07, Michael Olbrich: "kernel, barebox: use explicit list of config targets")
* 6db79433b230 (2020-09-28, Roland Hieber: "templates: add <PKG>_LICENSE_FILES variable where appropriate")
Link: https://git.pengutronix.de/cgit/ptxdist/commit/?h=b0f9f2fe33ca
Link: https://git.pengutronix.de/cgit/ptxdist/commit/?h=682d95986b7a
Link: https://git.pengutronix.de/cgit/ptxdist/commit/?h=5af76a1c7d63
Link: https://git.pengutronix.de/cgit/ptxdist/commit/?h=7fa9235fb915
Link: https://git.pengutronix.de/cgit/ptxdist/commit/?h=6db79433b230
Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
.../platform-mips/rules/barebox-ar9331.make | 17 +++++++-------
.../platform-mips/rules/barebox-malta.make | 21 +++++++++--------
.../platform-mipsel/rules/barebox-malta.make | 23 ++++++++++---------
3 files changed, 32 insertions(+), 29 deletions(-)
diff --git a/configs/platform-mips/rules/barebox-ar9331.make b/configs/platform-mips/rules/barebox-ar9331.make
index c769d2111978..8627f19c5e79 100644
--- a/configs/platform-mips/rules/barebox-ar9331.make
+++ b/configs/platform-mips/rules/barebox-ar9331.make
@@ -17,16 +17,17 @@ PACKAGES-$(PTXCONF_BAREBOX_AR9331) += barebox-ar9331
#
BAREBOX_AR9331_VERSION := $(call ptx/config-version, PTXCONF_BAREBOX)
BAREBOX_AR9331_MD5 := $(call ptx/config-md5, PTXCONF_BAREBOX)
-BAREBOX_AR9331 := barebox-ar9331-$(BAREBOX_AR9331_VERSION)
+BAREBOX_AR9331 := barebox-ar9331-$(BAREBOX_AR9331_VERSION)
BAREBOX_AR9331_SUFFIX := tar.bz2
BAREBOX_AR9331_URL := $(call barebox-url, BAREBOX_AR9331)
-BAREBOX_AR9331_PATCHES := barebox-$(BAREBOX_AR9331_VERSION)
+BAREBOX_AR9331_PATCHES := barebox-$(BAREBOX_AR9331_VERSION)
BAREBOX_AR9331_SOURCE := $(SRCDIR)/$(BAREBOX_AR9331_PATCHES).$(BAREBOX_AR9331_SUFFIX)
BAREBOX_AR9331_DIR := $(BUILDDIR)/$(BAREBOX_AR9331)
BAREBOX_AR9331_BUILD_DIR := $(BAREBOX_AR9331_DIR)-build
BAREBOX_AR9331_CONFIG := $(call ptx/in-platformconfigdir, barebox-ar9331.config)
BAREBOX_AR9331_REF_CONFIG := $(call ptx/in-platformconfigdir, barebox.config)
-BAREBOX_AR9331_LICENSE := GPL-2.0-only
+BAREBOX_AR9331_LICENSE := GPL-2.0-only
+BAREBOX_AR9331_LICENSE_FILES :=
BAREBOX_AR9331_BUILD_OOT := KEEP
# ----------------------------------------------------------------------------
@@ -34,18 +35,18 @@ BAREBOX_AR9331_BUILD_OOT := KEEP
# ----------------------------------------------------------------------------
# use host pkg-config for host tools
-BAREBOX_AR9331_PATH := PATH=$(HOST_PATH)
+BAREBOX_AR9331_PATH := PATH=$(HOST_PATH)
BAREBOX_AR9331_WRAPPER_BLACKLIST := \
$(PTXDIST_LOWLEVEL_WRAPPER_BLACKLIST)
-BAREBOX_AR9331_CONF_OPT := \
+BAREBOX_AR9331_CONF_TOOL := kconfig
+BAREBOX_AR9331_CONF_OPT := \
-C $(BAREBOX_AR9331_DIR) \
O=$(BAREBOX_AR9331_BUILD_DIR) \
- BUILDSYSTEM_VERSION=$(PTXDIST_VCS_VERSION) \
$(call barebox-opts, BAREBOX_AR9331)
-BAREBOX_AR9331_MAKE_OPT := $(BAREBOX_AR9331_CONF_OPT)
+BAREBOX_AR9331_MAKE_OPT := $(BAREBOX_AR9331_CONF_OPT)
BAREBOX_AR9331_IMAGES := images/barebox-dptechnics-dpt-module.img
BAREBOX_AR9331_IMAGES := $(addprefix $(BAREBOX_AR9331_BUILD_DIR)/,$(BAREBOX_AR9331_IMAGES))
@@ -106,7 +107,7 @@ $(STATEDIR)/barebox-ar9331.clean:
# oldconfig / menuconfig
# ----------------------------------------------------------------------------
-barebox-ar9331_oldconfig barebox-ar9331_menuconfig barebox-ar9331_nconfig: $(STATEDIR)/barebox-ar9331.extract
+$(call ptx/kconfig-targets, barebox-ar9331): $(STATEDIR)/barebox-ar9331.extract
@$(call world/kconfig, BAREBOX_AR9331, $(subst barebox-ar9331_,,$@))
# vim: syntax=make
diff --git a/configs/platform-mips/rules/barebox-malta.make b/configs/platform-mips/rules/barebox-malta.make
index ae4dcfe8d6e4..281f3338504b 100644
--- a/configs/platform-mips/rules/barebox-malta.make
+++ b/configs/platform-mips/rules/barebox-malta.make
@@ -17,35 +17,36 @@ PACKAGES-$(PTXCONF_BAREBOX_MALTA) += barebox-malta
#
BAREBOX_MALTA_VERSION := $(call ptx/config-version, PTXCONF_BAREBOX)
BAREBOX_MALTA_MD5 := $(call ptx/config-md5, PTXCONF_BAREBOX)
-BAREBOX_MALTA := barebox-malta-$(BAREBOX_MALTA_VERSION)
+BAREBOX_MALTA := barebox-malta-$(BAREBOX_MALTA_VERSION)
BAREBOX_MALTA_SUFFIX := tar.bz2
BAREBOX_MALTA_URL := $(call barebox-url, BAREBOX_MALTA)
-BAREBOX_MALTA_PATCHES := barebox-$(BAREBOX_MALTA_VERSION)
+BAREBOX_MALTA_PATCHES := barebox-$(BAREBOX_MALTA_VERSION)
BAREBOX_MALTA_SOURCE := $(SRCDIR)/$(BAREBOX_MALTA_PATCHES).$(BAREBOX_MALTA_SUFFIX)
BAREBOX_MALTA_DIR := $(BUILDDIR)/$(BAREBOX_MALTA)
-BAREBOX_MALTA_BUILD_DIR := $(BAREBOX_MALTA_DIR)-build
+BAREBOX_MALTA_BUILD_DIR := $(BAREBOX_MALTA_DIR)-build
BAREBOX_MALTA_CONFIG := $(call ptx/in-platformconfigdir, barebox-malta.config)
BAREBOX_MALTA_REF_CONFIG := $(call ptx/in-platformconfigdir, barebox.config)
-BAREBOX_MALTA_LICENSE := GPL-2.0-only
-BAREBOX_MALTA_BUILD_OOT := KEEP
+BAREBOX_MALTA_LICENSE := GPL-2.0-only
+BAREBOX_MALTA_LICENSE_FILES :=
+BAREBOX_MALTA_BUILD_OOT := KEEP
# ----------------------------------------------------------------------------
# Prepare
# ----------------------------------------------------------------------------
# use host pkg-config for host tools
-BAREBOX_MALTA_PATH := PATH=$(HOST_PATH)
+BAREBOX_MALTA_PATH := PATH=$(HOST_PATH)
BAREBOX_MALTA_WRAPPER_BLACKLIST := \
$(PTXDIST_LOWLEVEL_WRAPPER_BLACKLIST)
-BAREBOX_MALTA_CONF_OPT := \
+BAREBOX_MALTA_CONF_TOOL := kconfig
+BAREBOX_MALTA_CONF_OPT := \
-C $(BAREBOX_MALTA_DIR) \
O=$(BAREBOX_MALTA_BUILD_DIR) \
- BUILDSYSTEM_VERSION=$(PTXDIST_VCS_VERSION) \
$(call barebox-opts, BAREBOX_MALTA)
-BAREBOX_MALTA_MAKE_OPT := $(BAREBOX_MALTA_CONF_OPT)
+BAREBOX_MALTA_MAKE_OPT := $(BAREBOX_MALTA_CONF_OPT)
BAREBOX_MALTA_IMAGES := images/barebox-qemu-malta.img
BAREBOX_MALTA_IMAGES := $(addprefix $(BAREBOX_MALTA_BUILD_DIR)/,$(BAREBOX_MALTA_IMAGES))
@@ -106,7 +107,7 @@ $(STATEDIR)/barebox-malta.clean:
# oldconfig / menuconfig
# ----------------------------------------------------------------------------
-barebox-malta_oldconfig barebox-malta_menuconfig barebox-malta_nconfig: $(STATEDIR)/barebox-malta.extract
+$(call ptx/kconfig-targets, barebox-malta): $(STATEDIR)/barebox-malta.extract
@$(call world/kconfig, BAREBOX_MALTA, $(subst barebox-malta_,,$@))
# vim: syntax=make
diff --git a/configs/platform-mipsel/rules/barebox-malta.make b/configs/platform-mipsel/rules/barebox-malta.make
index ec40264bdc48..93502441fc0d 100644
--- a/configs/platform-mipsel/rules/barebox-malta.make
+++ b/configs/platform-mipsel/rules/barebox-malta.make
@@ -15,37 +15,38 @@ PACKAGES-$(PTXCONF_BAREBOX_MALTA) += barebox-malta
#
# Paths and names
#
-BAREBOX_MALTA_VERSION := $(call remove_quotes,$(PTXCONF_BAREBOX_VERSION))
+BAREBOX_MALTA_VERSION := $(call remove_quotes,$(PTXCONF_BAREBOX_VERSION))
BAREBOX_MALTA_MD5 := $(call remove_quotes,$(PTXCONF_BAREBOX_MD5))
-BAREBOX_MALTA := barebox-malta-$(BAREBOX_MALTA_VERSION)
+BAREBOX_MALTA := barebox-malta-$(BAREBOX_MALTA_VERSION)
BAREBOX_MALTA_SUFFIX := tar.bz2
BAREBOX_MALTA_URL := $(call barebox-url, BAREBOX_MALTA)
-BAREBOX_MALTA_PATCHES := barebox-$(BAREBOX_MALTA_VERSION)
+BAREBOX_MALTA_PATCHES := barebox-$(BAREBOX_MALTA_VERSION)
BAREBOX_MALTA_SOURCE := $(SRCDIR)/$(BAREBOX_MALTA_PATCHES).$(BAREBOX_MALTA_SUFFIX)
BAREBOX_MALTA_DIR := $(BUILDDIR)/$(BAREBOX_MALTA)
-BAREBOX_MALTA_BUILD_DIR := $(BAREBOX_MALTA_DIR)-build
+BAREBOX_MALTA_BUILD_DIR := $(BAREBOX_MALTA_DIR)-build
BAREBOX_MALTA_CONFIG := $(call ptx/in-platformconfigdir, barebox-malta.config)
BAREBOX_MALTA_REF_CONFIG := $(call ptx/in-platformconfigdir, barebox.config)
-BAREBOX_MALTA_LICENSE := GPL-2.0-only
-BAREBOX_MALTA_BUILD_OOT := KEEP
+BAREBOX_MALTA_LICENSE := GPL-2.0-only
+BAREBOX_MALTA_LICENSE_FILES :=
+BAREBOX_MALTA_BUILD_OOT := KEEP
# ----------------------------------------------------------------------------
# Prepare
# ----------------------------------------------------------------------------
# use host pkg-config for host tools
-BAREBOX_MALTA_PATH := PATH=$(HOST_PATH)
+BAREBOX_MALTA_PATH := PATH=$(HOST_PATH)
BAREBOX_MALTA_WRAPPER_BLACKLIST := \
$(PTXDIST_LOWLEVEL_WRAPPER_BLACKLIST)
-BAREBOX_MALTA_CONF_OPT := \
+BAREBOX_MALTA_CONF_TOOL := kconfig
+BAREBOX_MALTA_CONF_OPT := \
-C $(BAREBOX_MALTA_DIR) \
O=$(BAREBOX_MALTA_BUILD_DIR) \
- BUILDSYSTEM_VERSION=$(PTXDIST_VCS_VERSION) \
$(call barebox-opts, BAREBOX_MALTA)
-BAREBOX_MALTA_MAKE_OPT := $(BAREBOX_MALTA_CONF_OPT)
+BAREBOX_MALTA_MAKE_OPT := $(BAREBOX_MALTA_CONF_OPT)
BAREBOX_MALTA_IMAGES := images/barebox-qemu-malta.img
BAREBOX_MALTA_IMAGES := $(addprefix $(BAREBOX_MALTA_BUILD_DIR)/,$(BAREBOX_MALTA_IMAGES))
@@ -106,7 +107,7 @@ $(STATEDIR)/barebox-malta.clean:
# oldconfig / menuconfig
# ----------------------------------------------------------------------------
-barebox-malta_oldconfig barebox-malta_menuconfig barebox-malta_nconfig: $(STATEDIR)/barebox-malta.extract
+$(call ptx/kconfig-targets, barebox-malta): $(STATEDIR)/barebox-malta.extract
@$(call world/kconfig, BAREBOX_MALTA, $(subst barebox-malta_,,$@))
# vim: syntax=make
--
2.39.2
^ permalink raw reply [flat|nested] 20+ messages in thread
* [DistroKit] [PATCH v2 09/10] mips, mipsel: barebox-*: use ptx/image-install
2024-08-08 12:28 ` [DistroKit] [PATCH v2 01/10] mipsel: remove forked host-qemu rule Roland Hieber
` (6 preceding siblings ...)
2024-08-08 12:28 ` [DistroKit] [PATCH v2 08/10] mips, mipsel: barebox-*: sync with template Roland Hieber
@ 2024-08-08 12:28 ` Roland Hieber
2024-08-08 12:28 ` [DistroKit] [PATCH v2 10/10] mips, mipsel: barebox-*: set LICENSE_FILES Roland Hieber
2024-08-08 12:32 ` [DistroKit] [PATCH v2 01/10] mipsel: remove forked host-qemu rule Roland Hieber
9 siblings, 0 replies; 20+ messages in thread
From: Roland Hieber @ 2024-08-08 12:28 UTC (permalink / raw)
To: distrokit; +Cc: Roland Hieber
The images installed by ptx/image-install are automatically cleaned up
by PTXdist's default clean stage.
Forwarded: https://lore.ptxdist.org/ptxdist/20240802102529.1411407-2-rhi@pengutronix.de/
Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
.../platform-mips/rules/barebox-ar9331.make | 24 ++++++------------
.../platform-mips/rules/barebox-malta.make | 25 +++++++------------
.../platform-mipsel/rules/barebox-malta.make | 25 +++++++------------
3 files changed, 26 insertions(+), 48 deletions(-)
diff --git a/configs/platform-mips/rules/barebox-ar9331.make b/configs/platform-mips/rules/barebox-ar9331.make
index 8627f19c5e79..714f3191f688 100644
--- a/configs/platform-mips/rules/barebox-ar9331.make
+++ b/configs/platform-mips/rules/barebox-ar9331.make
@@ -85,24 +85,16 @@ $(STATEDIR)/barebox-ar9331.install:
$(STATEDIR)/barebox-ar9331.targetinstall:
@$(call targetinfo)
@$(foreach image, $(BAREBOX_AR9331_IMAGES), \
- install -m 644 \
- $(image) $(IMAGEDIR)/$(notdir $(image))$(ptx/nl))
- @install -D -m644 $(BAREBOX_AR9331_BUILD_DIR)/defaultenv/barebox_zero_env $(IMAGEDIR)/barebox-zero-env-ar9331
- @install -D -m644 $(BAREBOX_AR9331_BUILD_DIR)/arch/mips/dts/ar9331-dptechnics-dpt-module.dtb $(IMAGEDIR)/ar9331-dptechnics-dpt-module.dtb-bb
+ $(call ptx/image-install, BAREBOX_AR9331, $(image), \
+ $(notdir $(image))-ar9331)$(ptx/nl))
+ @$(call ptx/image-install, BAREBOX_AR9331, \
+ $(BAREBOX_AR9331_BUILD_DIR)/defaultenv/barebox_zero_env, \
+ barebox-zero-env-ar9331)
+ @$(call ptx/image-install, BAREBOX_AR9331, \
+ $(BAREBOX_AR9331_BUILD_DIR)/arch/mips/dts/ar9331-dptechnics-dpt-module.dtb, \
+ ar9331-dptechnics-dpt-module.dtb)
@$(call touch)
-# ----------------------------------------------------------------------------
-# Clean
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/barebox-ar9331.clean:
- @$(call targetinfo)
- @$(call clean_pkg, BAREBOX_AR9331)
- @$(foreach image, $(BAREBOX_AR9331_IMAGES), \
- rm -fv $(IMAGEDIR)/$(notdir $(image))$(ptx/nl))
- @rm -vf $(IMAGEDIR)/barebox-zero-env-ar9331 \
- $(IMAGEDIR)/ar9331-dptechnics-dpt-module.dtb-bb
-
# ----------------------------------------------------------------------------
# oldconfig / menuconfig
# ----------------------------------------------------------------------------
diff --git a/configs/platform-mips/rules/barebox-malta.make b/configs/platform-mips/rules/barebox-malta.make
index 281f3338504b..ff594480db7d 100644
--- a/configs/platform-mips/rules/barebox-malta.make
+++ b/configs/platform-mips/rules/barebox-malta.make
@@ -85,23 +85,16 @@ $(STATEDIR)/barebox-malta.install:
$(STATEDIR)/barebox-malta.targetinstall:
@$(call targetinfo)
@$(foreach image, $(BAREBOX_MALTA_IMAGES), \
- install -m 644 \
- $(image) $(IMAGEDIR)/$(notdir $(image))$(ptx/nl))
- @install -D -m644 $(BAREBOX_MALTA_BUILD_DIR)/defaultenv/barebox_zero_env $(IMAGEDIR)/barebox-zero-env-malta
- @install -D -m644 $(BAREBOX_MALTA_BUILD_DIR)/arch/mips/dts/qemu-malta.dtb $(IMAGEDIR)/qemu-malta.dtb-bb
- @$(call touch)
-
-# ----------------------------------------------------------------------------
-# Clean
-# ----------------------------------------------------------------------------
+ $(call ptx/image-install, BAREBOX_MALTA, $(image), \
+ $(notdir $(image))-malta)$(ptx/nl))
+ @$(call ptx/image-install, BAREBOX_MALTA, \
+ $(BAREBOX_MALTA_BUILD_DIR)/defaultenv/barebox_zero_env, \
+ barebox-zero-env-malta)
+ @$(call ptx/image-install, BAREBOX_MALTA, \
+ $(BAREBOX_MALTA_BUILD_DIR)/arch/mips/dts/qemu-malta.dtb, \
+ qemu-malta.dtb-bb)
-$(STATEDIR)/barebox-malta.clean:
- @$(call targetinfo)
- @$(call clean_pkg, BAREBOX_MALTA)
- @$(foreach image, $(BAREBOX_MALTA_IMAGES), \
- rm -fv $(IMAGEDIR)/$(notdir $(image))$(ptx/nl))
- @rm -vf $(IMAGEDIR)/barebox-zero-env-malta \
- $(IMAGEDIR)/qemu-malta.dtb-bb
+ @$(call touch)
# ----------------------------------------------------------------------------
# oldconfig / menuconfig
diff --git a/configs/platform-mipsel/rules/barebox-malta.make b/configs/platform-mipsel/rules/barebox-malta.make
index 93502441fc0d..64be579ea1a5 100644
--- a/configs/platform-mipsel/rules/barebox-malta.make
+++ b/configs/platform-mipsel/rules/barebox-malta.make
@@ -85,23 +85,16 @@ $(STATEDIR)/barebox-malta.install:
$(STATEDIR)/barebox-malta.targetinstall:
@$(call targetinfo)
@$(foreach image, $(BAREBOX_MALTA_IMAGES), \
- install -m 644 \
- $(image) $(IMAGEDIR)/$(notdir $(image))$(ptx/nl))
- @install -D -m644 $(BAREBOX_MALTA_BUILD_DIR)/defaultenv/barebox_zero_env $(IMAGEDIR)/barebox-zero-env-malta
- @install -D -m644 $(BAREBOX_MALTA_BUILD_DIR)/arch/mips/dts/qemu-malta.dtb $(IMAGEDIR)/qemu-malta.dtb-bb
- @$(call touch)
-
-# ----------------------------------------------------------------------------
-# Clean
-# ----------------------------------------------------------------------------
+ $(call ptx/image-install, BAREBOX_MALTA, $(image), \
+ $(notdir $(image))-malta)$(ptx/nl))
+ @$(call ptx/image-install, BAREBOX_MALTA, \
+ $(BAREBOX_MALTA_BUILD_DIR)/defaultenv/barebox_zero_env, \
+ barebox-zero-env-malta)
+ @$(call ptx/image-install, BAREBOX_MALTA, \
+ $(BAREBOX_MALTA_BUILD_DIR)/arch/mips/dts/qemu-malta.dtb, \
+ qemu-malta.dtb-bb)
-$(STATEDIR)/barebox-malta.clean:
- @$(call targetinfo)
- @$(call clean_pkg, BAREBOX_MALTA)
- @$(foreach image, $(BAREBOX_MALTA_IMAGES), \
- rm -fv $(IMAGEDIR)/$(notdir $(image))$(ptx/nl))
- @rm -vf $(IMAGEDIR)/barebox-zero-env-malta \
- $(IMAGEDIR)/qemu-malta.dtb-bb
+ @$(call touch)
# ----------------------------------------------------------------------------
# oldconfig / menuconfig
--
2.39.2
^ permalink raw reply [flat|nested] 20+ messages in thread
* [DistroKit] [PATCH v2 10/10] mips, mipsel: barebox-*: set LICENSE_FILES
2024-08-08 12:28 ` [DistroKit] [PATCH v2 01/10] mipsel: remove forked host-qemu rule Roland Hieber
` (7 preceding siblings ...)
2024-08-08 12:28 ` [DistroKit] [PATCH v2 09/10] mips, mipsel: barebox-*: use ptx/image-install Roland Hieber
@ 2024-08-08 12:28 ` Roland Hieber
2024-08-08 12:32 ` [DistroKit] [PATCH v2 01/10] mipsel: remove forked host-qemu rule Roland Hieber
9 siblings, 0 replies; 20+ messages in thread
From: Roland Hieber @ 2024-08-08 12:28 UTC (permalink / raw)
To: distrokit; +Cc: Roland Hieber
The source is not different than the upstream barebox rule, so we can
just use the same checksums.
Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
configs/platform-mips/rules/barebox-ar9331.make | 2 +-
configs/platform-mips/rules/barebox-malta.make | 2 +-
configs/platform-mipsel/rules/barebox-malta.make | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/configs/platform-mips/rules/barebox-ar9331.make b/configs/platform-mips/rules/barebox-ar9331.make
index 714f3191f688..13b517a48ce6 100644
--- a/configs/platform-mips/rules/barebox-ar9331.make
+++ b/configs/platform-mips/rules/barebox-ar9331.make
@@ -27,7 +27,7 @@ BAREBOX_AR9331_BUILD_DIR := $(BAREBOX_AR9331_DIR)-build
BAREBOX_AR9331_CONFIG := $(call ptx/in-platformconfigdir, barebox-ar9331.config)
BAREBOX_AR9331_REF_CONFIG := $(call ptx/in-platformconfigdir, barebox.config)
BAREBOX_AR9331_LICENSE := GPL-2.0-only
-BAREBOX_AR9331_LICENSE_FILES :=
+BAREBOX_AR9331_LICENSE_FILES := $(BAREBOX_LICENSE_FILES)
BAREBOX_AR9331_BUILD_OOT := KEEP
# ----------------------------------------------------------------------------
diff --git a/configs/platform-mips/rules/barebox-malta.make b/configs/platform-mips/rules/barebox-malta.make
index ff594480db7d..52ded8ce41c4 100644
--- a/configs/platform-mips/rules/barebox-malta.make
+++ b/configs/platform-mips/rules/barebox-malta.make
@@ -27,7 +27,7 @@ BAREBOX_MALTA_BUILD_DIR := $(BAREBOX_MALTA_DIR)-build
BAREBOX_MALTA_CONFIG := $(call ptx/in-platformconfigdir, barebox-malta.config)
BAREBOX_MALTA_REF_CONFIG := $(call ptx/in-platformconfigdir, barebox.config)
BAREBOX_MALTA_LICENSE := GPL-2.0-only
-BAREBOX_MALTA_LICENSE_FILES :=
+BAREBOX_MALTA_LICENSE_FILES := $(BAREBOX_LICENSE_FILES)
BAREBOX_MALTA_BUILD_OOT := KEEP
# ----------------------------------------------------------------------------
diff --git a/configs/platform-mipsel/rules/barebox-malta.make b/configs/platform-mipsel/rules/barebox-malta.make
index 64be579ea1a5..9143d47433c8 100644
--- a/configs/platform-mipsel/rules/barebox-malta.make
+++ b/configs/platform-mipsel/rules/barebox-malta.make
@@ -27,7 +27,7 @@ BAREBOX_MALTA_BUILD_DIR := $(BAREBOX_MALTA_DIR)-build
BAREBOX_MALTA_CONFIG := $(call ptx/in-platformconfigdir, barebox-malta.config)
BAREBOX_MALTA_REF_CONFIG := $(call ptx/in-platformconfigdir, barebox.config)
BAREBOX_MALTA_LICENSE := GPL-2.0-only
-BAREBOX_MALTA_LICENSE_FILES :=
+BAREBOX_MALTA_LICENSE_FILES := $(BAREBOX_LICENSE_FILES)
BAREBOX_MALTA_BUILD_OOT := KEEP
# ----------------------------------------------------------------------------
--
2.39.2
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [DistroKit] [PATCH v2 01/10] mipsel: remove forked host-qemu rule
2024-08-08 12:28 ` [DistroKit] [PATCH v2 01/10] mipsel: remove forked host-qemu rule Roland Hieber
` (8 preceding siblings ...)
2024-08-08 12:28 ` [DistroKit] [PATCH v2 10/10] mips, mipsel: barebox-*: set LICENSE_FILES Roland Hieber
@ 2024-08-08 12:32 ` Roland Hieber
9 siblings, 0 replies; 20+ messages in thread
From: Roland Hieber @ 2024-08-08 12:32 UTC (permalink / raw)
To: distrokit
Ahh, I forgot the changelog for v2:
Patches 01 and 02 were reordered, and the log message in patch (now-)02
was updated to explain the PAHOLE changes. Patches 03 to 10 are new.
- Roland
--
Roland Hieber, Pengutronix e.K. | r.hieber@pengutronix.de |
Steuerwalder Str. 21 | https://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [DistroKit] [PATCH v2 06/10] mips, mipsel: kernel-*: select KERNEL
2024-08-08 12:28 ` [DistroKit] [PATCH v2 06/10] mips, mipsel: kernel-*: select KERNEL Roland Hieber
@ 2024-08-08 13:41 ` Michael Olbrich
2024-08-13 13:23 ` Roland Hieber
0 siblings, 1 reply; 20+ messages in thread
From: Michael Olbrich @ 2024-08-08 13:41 UTC (permalink / raw)
To: Roland Hieber; +Cc: distrokit
On Thu, Aug 08, 2024 at 02:28:42PM +0200, Roland Hieber wrote:
> We're using PTXCONF_KERNEL_VERSION and PTXCONF_KERNEL_MD5 in our rules,
> which are only defined when KERNEL is selected.
>
> Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> ---
> configs/platform-mips/platforms/kernel-ar9331.in | 1 +
> configs/platform-mips/platforms/kernel-malta.in | 1 +
> configs/platform-mipsel/platforms/kernel-malta.in | 1 +
> 3 files changed, 3 insertions(+)
>
> diff --git a/configs/platform-mips/platforms/kernel-ar9331.in b/configs/platform-mips/platforms/kernel-ar9331.in
> index e7dd81f3e410..47f8ac8e7a85 100644
> --- a/configs/platform-mips/platforms/kernel-ar9331.in
> +++ b/configs/platform-mips/platforms/kernel-ar9331.in
> @@ -6,5 +6,6 @@ config KERNEL_AR9331
> select HOST_LIBKMOD
> select HOST_SYSTEM_BC
> #select HOST_U_BOOT_TOOLS
> + select KERNEL
select KERNEL if BUILDTIME
That avoids dependencies in the ipkgs.
Michael
> help
> FIXME
> diff --git a/configs/platform-mips/platforms/kernel-malta.in b/configs/platform-mips/platforms/kernel-malta.in
> index 069ccceba301..92a22d0ca090 100644
> --- a/configs/platform-mips/platforms/kernel-malta.in
> +++ b/configs/platform-mips/platforms/kernel-malta.in
> @@ -6,5 +6,6 @@ config KERNEL_MALTA
> select HOST_LIBKMOD
> select HOST_SYSTEM_BC
> #select HOST_U_BOOT_TOOLS
> + select KERNEL
> help
> FIXME
> diff --git a/configs/platform-mipsel/platforms/kernel-malta.in b/configs/platform-mipsel/platforms/kernel-malta.in
> index 069ccceba301..92a22d0ca090 100644
> --- a/configs/platform-mipsel/platforms/kernel-malta.in
> +++ b/configs/platform-mipsel/platforms/kernel-malta.in
> @@ -6,5 +6,6 @@ config KERNEL_MALTA
> select HOST_LIBKMOD
> select HOST_SYSTEM_BC
> #select HOST_U_BOOT_TOOLS
> + select KERNEL
> help
> FIXME
> --
> 2.39.2
>
>
>
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [DistroKit] [PATCH v2 06/10] mips, mipsel: kernel-*: select KERNEL
2024-08-08 13:41 ` Michael Olbrich
@ 2024-08-13 13:23 ` Roland Hieber
0 siblings, 0 replies; 20+ messages in thread
From: Roland Hieber @ 2024-08-13 13:23 UTC (permalink / raw)
To: distrokit
On Thu, Aug 08, 2024 at 03:41:47PM +0200, Michael Olbrich wrote:
> On Thu, Aug 08, 2024 at 02:28:42PM +0200, Roland Hieber wrote:
> > We're using PTXCONF_KERNEL_VERSION and PTXCONF_KERNEL_MD5 in our rules,
> > which are only defined when KERNEL is selected.
> >
> > Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> > ---
> > configs/platform-mips/platforms/kernel-ar9331.in | 1 +
> > configs/platform-mips/platforms/kernel-malta.in | 1 +
> > configs/platform-mipsel/platforms/kernel-malta.in | 1 +
> > 3 files changed, 3 insertions(+)
> >
> > diff --git a/configs/platform-mips/platforms/kernel-ar9331.in b/configs/platform-mips/platforms/kernel-ar9331.in
> > index e7dd81f3e410..47f8ac8e7a85 100644
> > --- a/configs/platform-mips/platforms/kernel-ar9331.in
> > +++ b/configs/platform-mips/platforms/kernel-ar9331.in
> > @@ -6,5 +6,6 @@ config KERNEL_AR9331
> > select HOST_LIBKMOD
> > select HOST_SYSTEM_BC
> > #select HOST_U_BOOT_TOOLS
> > + select KERNEL
>
> select KERNEL if BUILDTIME
>
> That avoids dependencies in the ipkgs.
>
> Michael
Sorry, it's too hot today, and I replied to the wrong thread… v3 is at
https://lore.distrokit.org/distrokit/20240813132050.3914043-1-rhi@pengutronix.de/
- Roland
--
Roland Hieber, Pengutronix e.K. | r.hieber@pengutronix.de |
Steuerwalder Str. 21 | https://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
^ permalink raw reply [flat|nested] 20+ messages in thread
end of thread, other threads:[~2024-08-13 13:23 UTC | newest]
Thread overview: 20+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-07-31 9:14 [DistroKit] [PATCH 1/2] mipsel: sync kernelconfig Roland Hieber
2024-07-31 9:14 ` [DistroKit] [PATCH 2/2] mipsel: remove forked host-qemu rule Roland Hieber
2024-07-31 11:42 ` [DistroKit] [PATCH 1/2] mipsel: sync kernelconfig Robert Schwebel
2024-07-31 12:07 ` Alexander Dahl
2024-07-31 12:10 ` Michael Olbrich
2024-07-31 12:23 ` Roland Hieber
2024-07-31 12:33 ` Robert Schwebel
2024-08-08 12:28 ` [DistroKit] [PATCH v2 01/10] mipsel: remove forked host-qemu rule Roland Hieber
2024-08-08 12:28 ` [DistroKit] [PATCH v2 02/10] mipsel: sync kernelconfig Roland Hieber
2024-08-08 12:28 ` [DistroKit] [PATCH v2 03/10] mips, mipsel: remove forked kernel rule Roland Hieber
2024-08-08 12:28 ` [DistroKit] [PATCH v2 04/10] mips, mipsel: kernel-*: sync with template Roland Hieber
2024-08-08 12:28 ` [DistroKit] [PATCH v2 05/10] mips, mipsel: kernel-*: use ptx/image-install and fix 'clean' stage Roland Hieber
2024-08-08 12:28 ` [DistroKit] [PATCH v2 06/10] mips, mipsel: kernel-*: select KERNEL Roland Hieber
2024-08-08 13:41 ` Michael Olbrich
2024-08-13 13:23 ` Roland Hieber
2024-08-08 12:28 ` [DistroKit] [PATCH v2 07/10] mips, mipsel: migrate barebox-common recipe to barebox Roland Hieber
2024-08-08 12:28 ` [DistroKit] [PATCH v2 08/10] mips, mipsel: barebox-*: sync with template Roland Hieber
2024-08-08 12:28 ` [DistroKit] [PATCH v2 09/10] mips, mipsel: barebox-*: use ptx/image-install Roland Hieber
2024-08-08 12:28 ` [DistroKit] [PATCH v2 10/10] mips, mipsel: barebox-*: set LICENSE_FILES Roland Hieber
2024-08-08 12:32 ` [DistroKit] [PATCH v2 01/10] mipsel: remove forked host-qemu rule Roland Hieber
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox