Use common images from meta-dimonoff

diff --git a/recipes-core/images/image-hvmpd-dev.bb b/recipes-core/images/image-hvmpd-dev.bb
index 06e3ff6..98751f9 100644 (file)
--- a/recipes-core/images/image-hvmpd-dev.bb
+++ b/recipes-core/images/image-hvmpd-dev.bb
@@ -1,19 +1,6 @@
 SUMMARY = "HV MPD development image"
 
-require include/image-hvmpd-common.inc
-
-# Image suitable for development (empty root password):
-IMAGE_FEATURES += "debug-tweaks"
-
-# Add debugging tools (gdb and strace, etc):
-#IMAGE_FEATURES += "tools-debug"
+# In meta-dimonoff:
+require recipes-core/images/image-gateway-dev.bb
 
-# Add development tools (gcc, make, pkgconfig, etc):
-#IMAGE_FEATURES += "tools-sdk"
-
-# Additional development tools:
-IMAGE_INSTALL:append = " \
-       curl \
-       lsof \
-       spitools \
-"
+require include/image-hvmpd-common.inc

diff --git a/recipes-core/images/image-hvmpd-prod.bb b/recipes-core/images/image-hvmpd-prod.bb
index 69d5098..5c01e97 100644 (file)
--- a/recipes-core/images/image-hvmpd-prod.bb
+++ b/recipes-core/images/image-hvmpd-prod.bb
@@ -1,3 +1,6 @@
 SUMMARY = "HV MPD production image"
 
+# In meta-dimonoff:
+require recipes-core/images/image-gateway-prod.bb
+
 require include/image-hvmpd-common.inc

diff --git a/recipes-core/images/include/image-hvmpd-common.inc b/recipes-core/images/include/image-hvmpd-common.inc
index ba1da71..ef1cefe 100644 (file)
--- a/recipes-core/images/include/image-hvmpd-common.inc
+++ b/recipes-core/images/include/image-hvmpd-common.inc
@@ -1,20 +1,5 @@
-LICENSE = "CLOSED"
-
-inherit core-image
-
-IMAGE_FEATURES += "ssh-server-openssh"
-
 # Common features/components:
 IMAGE_INSTALL:append = " \
-    libgpiod-tools \
-    parted \
-    e2fsprogs \
-    nano \
-    tzdata \
-    util-linux \
-    sudo \
-    evtest \
-    i2c-tools \
     ethtool \
     nfs-utils \
     rsync \
@@ -27,6 +12,9 @@ IMAGE_INSTALL:append = " \
     kernel-modules \
 "
 
+# Not using extlinux for now:
+IMAGE_INSTALL:remove = "${PREFERRED_PROVIDER_virtual/bootloader}-extlinux"
+
 # Music server specific features/components:
 IMAGE_INSTALL:append = " \
     alsa-utils \
@@ -40,26 +28,3 @@ IMAGE_INSTALL:append = " \
 IMAGE_INSTALL:append = " \
     avahi-daemon \
 "
-
-IMAGE_INSTALL:append = " \
-    libubootenv \
-    u-boot-fw-utils \
-    u-boot-default-env \
-"
-
-# Add SWUpdate components
-IMAGE_INSTALL:append = " \
-    swupdate \
-    swupdate-usb \
-    swupdate-progress \
-"
-
-EXTRA_IMAGEDEPENDS += "swupdate-ab"
-
-# Remove swupdate-www (package with the website, that you can customize with
-# your own logo, template and style).
-IMAGE_INSTALL:remove = " \
-    swupdate-www \
-"
-
-IMAGE_FSTYPES += "tar.gz"

diff --git a/recipes-core/images/include/update-common.inc b/recipes-core/images/include/update-common.inc
deleted file mode 100644 (file)
index eb9a50f..0000000
--- a/recipes-core/images/include/update-common.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-LICENSE = "CLOSED"
-
-FILESEXTRAPATHS:prepend := "${THISDIR}/update:"
-
-SRC_URI = " \
-    file://sw-description \
-"
-
-# Image(s) and files that will be included in the .swu image
-SWUPDATE_IMAGES = "${IMAGE_DEPENDS} swupdate-ab.sh"
-
-UBOOT_PART_VAR ?= "mmcpart"
-
-inherit swupdate