Make a package for kmod-nvme and include it into the image.

- show the manifest existing after make image instead of making a new one;
  - don't move packages to out - the directory is ignored by multibuild;
  - don't make package index, because imagebuilder builds it's own.

.buildbot/openwrt/Dockerfile

@@ -21,7 +21,7 @@ RUN wget -qP /Downloads \
 RUN wget -qP /Downloads \
      "https://downloads.openwrt.org/releases/${OPENWRT_VERSION}/targets/bcm27xx/bcm2711/openwrt-sdk-${OPENWRT_VERSION}-${OPENWRT_TARGET}-${OPENWRT_DEVICE}_${OPENWRT_CC}.Linux-x86_64.tar.xz"
 
-RUN wget -qP /Downloads \
-     "https://downloads.openwrt.org/releases/${OPENWRT_VERSION}/targets/bcm27xx/bcm2711/openwrt-toolchain-${OPENWRT_VERSION}-${OPENWRT_TARGET}-${OPENWRT_DEVICE}_${OPENWRT_CC}.Linux-x86_64.tar.xz"
+# RUN wget -qP /Downloads \
+#      "https://downloads.openwrt.org/releases/${OPENWRT_VERSION}/targets/bcm27xx/bcm2711/openwrt-toolchain-${OPENWRT_VERSION}-${OPENWRT_TARGET}-${OPENWRT_DEVICE}_${OPENWRT_CC}.Linux-x86_64.tar.xz"
 
 ADD . .

.buildbot/openwrt/build.sh

@@ -33,8 +33,6 @@ make package/kmod-i2c-mux-pinctrl/compile
 make package/kmod-rtc-pcf85063/compile
 make package/asterisk-chan-quectel/compile
 make package/collectd/compile
-# no signing key
-make package/index
 
 sdkdir=$(pwd)
 cd ${pwd}
@@ -49,7 +47,7 @@ cd openwrt-imagebuilder-*/
 cp ${sdkdir}/${BINPATH}/packages/*.ipk packages/
 cp ${sdkdir}/bin/packages/aarch64_cortex-a72/packages/*.ipk packages/
 cp ${sdkdir}/bin/packages/aarch64_cortex-a72/telephony/*.ipk packages/
-cp ${sdkdir}/bin/packages/aarch64_cortex-a72/quectel/*.ipk packages/
+cp ${sdkdir}/bin/packages/aarch64_cortex-a72/local/*.ipk packages/
 
 make info
 
@@ -129,7 +127,7 @@ git apply ${pwd}/patches/bootconfig-add.patch
 popd
 
 make image PROFILE=${PROFILE} \
-     PACKAGES="${PACKAGES}" DISABLED_SERVICES="dropbear" FILES="files"
+     PACKAGES="${PACKAGES}" DISABLED_SERVICES="dropbear" FILES="files" || exit 1
 
 mv ${IMAGE_PATH}-squashfs-factory.img.gz ${IMAGE_PATH}-squashfs-factory-dualeth.img.gz
 mv ${IMAGE_PATH}-squashfs-sysupgrade.img.gz ${IMAGE_PATH}-squashfs-sysupgrade-dualeth.img.gz
@@ -143,16 +141,15 @@ git apply ${pwd}/patches/overlay-add.patch
 popd
 
 make image PROFILE=${PROFILE} \
-     PACKAGES="${PACKAGES}" DISABLED_SERVICES="dropbear" FILES="files"
+     PACKAGES="${PACKAGES}" DISABLED_SERVICES="dropbear" FILES="files" || exit 1
 
 mv ${IMAGE_PATH}-squashfs-factory.img.gz ${IMAGE_PATH}-squashfs-factory-sensing.img.gz
 mv ${IMAGE_PATH}-squashfs-sysupgrade.img.gz ${IMAGE_PATH}-squashfs-sysupgrade-sensing.img.gz
 
 
-make manifest PROFILE=${PROFILE} PACKAGES="${PACKAGES}"
+cat ${BINPATH}/*.manifest
 
 out=../../out
 
 mkdir -p ${out}
 mv ${BINPATH}/*.gz ${out}
-mv packages ${out}

feed/kmod-i2c-mux-pinctrl/Makefile

@@ -2,7 +2,6 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=i2c-mux-pinctrl
-PKG_RELEASE:=1
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -19,23 +18,8 @@ define KernelPackage/$(PKG_NAME)/description
  Kernel modules for GENERIC_PINCTRL I2C bus mux/switching devices
 endef
 
-EXTRA_KCONFIG:= \
-        CONFIG_I2C_MUX_PINCTRL=m
+EXTRA_KCONFIG:= CONFIG_I2C_MUX_PINCTRL=m
 
-EXTRA_CFLAGS:= \
-        $(patsubst CONFIG_%, -DCONFIG_%=1, $(patsubst %=m,%,$(filter %=m,$(EXTRA_KCONFIG)))) \
-        $(patsubst CONFIG_%, -DCONFIG_%=1, $(patsubst %=y,%,$(filter %=y,$(EXTRA_KCONFIG)))) \
-
-MAKE_OPTS:= \
-        $(KERNEL_MAKE_FLAGS) \
-        M="$(PKG_BUILD_DIR)" \
-        EXTRA_CFLAGS="$(EXTRA_CFLAGS)" \
-        $(EXTRA_KCONFIG)
-
-define Build/Compile
-        $(MAKE) -C "$(LINUX_DIR)" \
-                $(MAKE_OPTS) \
-                modules
-endef
+include ../kmod.mk
 
 $(eval $(call KernelPackage,$(PKG_NAME)))

feed/kmod-nvme/Makefile

@@ -2,7 +2,6 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=nvme
-PKG_RELEASE:=1
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -28,20 +27,6 @@ EXTRA_KCONFIG:= \
 	CONFIG_NVME_MULTIPATH=n \
 	CONFIG_NVME_HWMON=n
 
-EXTRA_CFLAGS:= \
-        $(patsubst CONFIG_%, -DCONFIG_%=1, $(patsubst %=m,%,$(filter %=m,$(EXTRA_KCONFIG)))) \
-        $(patsubst CONFIG_%, -DCONFIG_%=1, $(patsubst %=y,%,$(filter %=y,$(EXTRA_KCONFIG)))) \
-
-MAKE_OPTS:= \
-        $(KERNEL_MAKE_FLAGS) \
-        M="$(PKG_BUILD_DIR)" \
-        EXTRA_CFLAGS="$(EXTRA_CFLAGS)" \
-        $(EXTRA_KCONFIG)
-
-define Build/Compile
-        $(MAKE) -C "$(LINUX_DIR)" \
-        $(MAKE_OPTS) \
-        modules
-endef
+include ../kmod.mk
 
 $(eval $(call KernelPackage,$(PKG_NAME)))

feed/kmod-rtc-pcf85063/Makefile

@@ -2,7 +2,6 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=rtc-pcf85063
-PKG_RELEASE:=1
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -23,20 +22,6 @@ EXTRA_KCONFIG:= \
         CONFIG_RTC_DRV_PCF85063=m \
         CONFIG_RTC_CLASS=y
 
-EXTRA_CFLAGS:= \
-        $(patsubst CONFIG_%, -DCONFIG_%=1, $(patsubst %=m,%,$(filter %=m,$(EXTRA_KCONFIG)))) \
-        $(patsubst CONFIG_%, -DCONFIG_%=1, $(patsubst %=y,%,$(filter %=y,$(EXTRA_KCONFIG)))) \
-
-MAKE_OPTS:= \
-        $(KERNEL_MAKE_FLAGS) \
-        M="$(PKG_BUILD_DIR)" \
-        EXTRA_CFLAGS="$(EXTRA_CFLAGS)" \
-        $(EXTRA_KCONFIG)
-
-define Build/Compile
-        $(MAKE) -C "$(LINUX_DIR)" \
-                $(MAKE_OPTS) \
-                modules
-endef
+include ../kmod.mk
 
 $(eval $(call KernelPackage,$(PKG_NAME)))

feed/kmod.mk

@@ -0,0 +1,18 @@
+
+PKG_RELEASE?=1
+
+EXTRA_CFLAGS:= \
+        $(patsubst CONFIG_%, -DCONFIG_%=1, $(patsubst %=m,%,$(filter %=m,$(EXTRA_KCONFIG)))) \
+        $(patsubst CONFIG_%, -DCONFIG_%=1, $(patsubst %=y,%,$(filter %=y,$(EXTRA_KCONFIG)))) \
+
+MAKE_OPTS:= \
+        $(KERNEL_MAKE_FLAGS) \
+        M="$(PKG_BUILD_DIR)" \
+        EXTRA_CFLAGS="$(EXTRA_CFLAGS)" \
+        $(EXTRA_KCONFIG)
+
+define Build/Compile
+        $(MAKE) -C "$(LINUX_DIR)" \
+                $(MAKE_OPTS) \
+                modules
+endef

feeds.conf

@@ -1,2 +1,2 @@
 
-src-link quectel ../feed
+src-link local ../feed