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

Also move there kmod-nvme.

.buildbot/openwrt/build.sh

@@ -58,7 +58,7 @@ echo "CONFIG_TARGET_ROOTFS_PARTSIZE=308" >> .config
 echo "CONFIG_TARGET_ROOTFS_EXT4FS=n" >> .config
 
 PACKAGES="kmod-i2c-bcm2835 kmod-i2c-mux kmod-i2c-mux-pinctrl \
-          kmod-nf-nathelper-extra kmod-nvme \
+          kmod-nf-nathelper-extra \
 	  kmod-rtc-ds1307 kmod-rtc-pcf8563 kmod-rtc-pcf85063 \
 	  kmod-usb-audio kmod-usb-net-rtl8152 \
 	  alsa-lib pciutils usbutils \
@@ -132,8 +132,8 @@ sed -i "s|,i2c_csi_dsi||g" ${BOOTSOURCE}/current.txt
 
 make image PROFILE=${PROFILE} \
      PACKAGES=" \
-	${PACKAGES} kmod-ata-ahci smartmontools hdparm fdisk parted \
-	kmod-hwmon-drivetemp btrfs-progs kmod-fs-btrfs nvme-cli cryptsetup" \
+	${PACKAGES} cryptsetup kmod-ata-ahci smartmontools hdparm fdisk parted \
+	kmod-hwmon-drivetemp btrfs-progs kmod-fs-btrfs kmod-nvme nvme-cli" \
      DISABLED_SERVICES="dropbear" FILES="files" || exit 1
 
 mv ${IMAGE_PATH}-squashfs-factory.img.gz ${IMAGE_PATH}-squashfs-factory-waveshare.img.gz

feed/nvme-cli/Makefile

@@ -34,7 +34,7 @@ endef
 
 define Package/$(PKG_NAME)/install
 	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/nvme $(1)/usr/sbin/nvme-cli
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/nvme $(1)/usr/sbin/
 	$(INSTALL_DIR) $(1)/usr/include
 	$(CP) $(PKG_INSTALL_DIR)/usr/include/json-c $(1)/usr/include/
 	$(CP) $(PKG_INSTALL_DIR)/usr/include/nvme $(1)/usr/include/