Increase the verbosity for kernel-custom build

.buildbot/openwrt/build.sh

@@ -11,6 +11,9 @@
 
 set -x
 
+renice -n 19 $$
+export MAKEOPTS="-j$(nproc)"  # FIXME: not sure why export
+
 tar -xJf /Downloads/openwrt-sdk-${OPENWRT_VERSION}-*.tar.xz
 
 cp -r feed openwrt-sdk-*/
@@ -26,20 +29,27 @@ sed -i "s/\(packages.git\)\^.*/\1;openwrt-22.03/g" feeds.conf
 ./scripts/feeds update -a
 ./scripts/feeds install -a
 
-git apply ${pwd}/patches/i2c-tools-revert.patch
+cat << "EOF" >> target/linux/${OPENWRT_TARGET}/${OPENWRT_DEVICE}/config-5.10
+CONFIG_HWMON=y
+CONFIG_NVME_CORE=y
+CONFIG_BLK_DEV_NVME=y
+CONFIG_NVME_HWMON=y
+CONFIG_NVME_MULTIPATH=n
+EOF
 
 make defconfig
 # Enable collectd network encryption
 echo "CONFIG_PACKAGE_COLLECTD_ENCRYPTED_NETWORK=y" >> .config
 
-make package/i2c-tools/compile
-make package/kmod-nvme/compile
+make $MAKEOPTS package/i2c-tools/compile
 make package/kmod-i2c-mux-pinctrl/compile
 make package/kmod-rtc-pcf85063/compile
 make package/nvme-cli/compile
 make package/ansible-core/compile
 make package/asterisk-chan-quectel/compile
-make package/collectd/compile
+make $MAKEOPTS package/collectd/compile
+# FIXME: need to extend the regexp for errors
+make $MAKEOPTS V=s package/kernel-custom/compile 2>&1 | grep '^make'
 
 sdkdir=$(pwd)
 cd ${pwd}
@@ -103,7 +113,8 @@ PACKAGES="kmod-i2c-bcm2835 kmod-i2c-mux kmod-i2c-mux-pinctrl \
 
 BOOTSOURCE=target/linux/${OPENWRT_TARGET}/image
 BOOTCONFIG=${BOOTSOURCE}/config.txt
-KERNELSOURCE=build_dir/target-${PKG_ARCH}_musl/linux-${OPENWRT_TARGET}_${OPENWRT_DEVICE}/linux-5.10.146
+KERNELDIR=build_dir/target-${PKG_ARCH}_musl/linux-${OPENWRT_TARGET}_${OPENWRT_DEVICE}
+KERNELSOURCE=${KERNELDIR}/linux-5.10.146
 OVERLAYSOURCE=${KERNELSOURCE}/arch/arm64/boot/dts/overlays
 
 # Setup files
@@ -141,10 +152,13 @@ make image PROFILE=${PROFILE} EXTRA_IMAGE_NAME="dualeth" \
 sed -i "s|,i2c_csi_dsi||g" ${BOOTSOURCE}/current.txt
 sed -i "s/CONFIG_TARGET_ROOTFS_PARTSIZE=.*/CONFIG_TARGET_ROOTFS_PARTSIZE=768/g" .config
 
+cp ${sdkdir}/${KERNELDIR}/Image ${KERNELDIR}/
+cp ${sdkdir}/${KERNELDIR}/vmlinux* ${KERNELDIR}/
+
 make image PROFILE=${PROFILE} EXTRA_IMAGE_NAME="waveshare" \
      PACKAGES=" \
 	${PACKAGES} cryptsetup kmod-ata-ahci smartmontools hdparm fdisk parted \
-	kmod-hwmon-drivetemp btrfs-progs kmod-fs-btrfs kmod-nvme nvme-cli \
+	kmod-hwmon-drivetemp btrfs-progs kmod-fs-btrfs nvme-cli \
         docker dockerd docker-compose block-mount" \
      DISABLED_SERVICES="dropbear" FILES="files" || exit 1
 

feed/kernel-custom/Makefile

@@ -0,0 +1,69 @@
+#
+# Copyright (C) 2006-2010 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/kernel.mk
+
+PKG_NAME:=kernel-custom
+PKG_FLAGS:=hold
+
+PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/packages
+SUBTARGETS = $(sort $(filter-out feeds,$(notdir $(wildcard $(TOPDIR)/target/linux/* $(TOPDIR)/target/linux/feeds/*))))
+SUBTARGET_MODULES = $(foreach t,$(SUBTARGETS),$(firstword $(wildcard $(TOPDIR)/target/linux/feeds/$(t)/modules.mk $(TOPDIR)/target/linux/$(t)/modules.mk)))
+SCAN_DEPS=modules/*.mk $(SUBTARGET_MODULES) $(TOPDIR)/include/netfilter.mk
+
+PKG_LICENSE:=GPL-2.0
+PKG_LICENSE_FILES:=
+
+export SHELL:=/bin/sh
+.ONESHELL:
+.SHELLFLAGS = -ec
+
+TARGET_BUILD:=1
+
+include $(INCLUDE_DIR)/kernel-build.mk
+include $(INCLUDE_DIR)/package.mk
+
+define Build/Prepare
+endef
+
+define Build/Configure
+endef
+
+define Kernel/CompileModules
+	$(call Kernel/CompileImage)
+endef
+
+define Build/Compile
+	$(call BuildKernel)
+endef
+
+define KernelPackage/depends
+endef
+
+CONFIG_PACKAGE_kernel=y
+define Package/$(PKG_NAME)
+  SECTION:=sys
+  CATEGORY:=Kernel
+  DEFAULT:=y
+  TITLE:=Virtual kernel package
+  VERSION:=$(LINUX_VERSION)-$(LINUX_RELEASE)-$(LINUX_VERMAGIC)
+  URL:=http://www.kernel.org/
+  PKG_FLAGS:=nonshared
+endef
+
+define Package/$(PKG_NAME)/install
+  # nothing to do
+endef
+
+define Package/$(PKG_NAME)/extra_provides
+	sed -e 's,.*/,,' $(LINUX_DIR)/modules.builtin;
+endef
+
+$(eval $(if $(DUMP),,$(call BuildPackage,$(PKG_NAME))))
+
+include $(sort $(wildcard ./modules/*.mk))

patches/i2c-tools-revert.patch

@@ -1,34 +0,0 @@
---- a/feeds/packages/utils/i2c-tools/Makefile	2023-10-19 02:48:26.528051917 +0000
-+++ b/feeds/packages/utils/i2c-tools/Makefile	2023-10-19 02:50:13.281230932 +0000
-@@ -9,7 +9,7 @@
- 
- PKG_NAME:=i2c-tools
- PKG_VERSION:=4.3
--PKG_RELEASE:=3
-+PKG_RELEASE:=1
- 
- PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
- PKG_SOURCE_URL:=@KERNEL/software/utils/i2c-tools
-@@ -67,9 +67,8 @@
-  This package contain the Python3 bindings for Linux SMBus access through i2c-dev.
- endef
- 
--PYTHON3_PKG_BUILD_PATH:=py-smbus
--PYTHON3_PKG_WHEEL_NAME:=smbus
--PYTHON3_PKG_WHEEL_VERSION:=1.1
-+PYTHON3_PKG_SETUP_ARGS:=
-+PYTHON3_PKG_SETUP_DIR:=py-smbus
- 
- define Build/Compile
- 	$(MAKE) -C $(PKG_BUILD_DIR) \
-@@ -87,10 +86,6 @@
- 	$(CP) $(PKG_BUILD_DIR)/lib/libi2c.{a,so*} $(1)/usr/lib/
- endef
- 
--define Build/Install
--	$(call Py3Build/Install)
--endef
--
- define Package/libi2c/install
- 	$(INSTALL_DIR) $(1)/usr/lib
- 	$(CP) $(PKG_BUILD_DIR)/lib/libi2c.so* $(1)/usr/lib/