Move image include file to include folder

diff --git a/recipes-core/images/image-hvmpd-common.inc b/recipes-core/images/image-hvmpd-common.inc
deleted file mode 100644 (file)
index 0e901ef..0000000
--- a/recipes-core/images/image-hvmpd-common.inc
+++ /dev/null
@@ -1,54 +0,0 @@
-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 \
-"
-
-# Music server specific features/components:
-IMAGE_INSTALL:append = " \
-       alsa-utils \
-       mpd \
-       mpc \
-       ympd \
-       shairport-sync \
-"
-
-# Needed by shairport-sync:
-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 \
-"
-
-# 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/image-hvmpd-dev.bb b/recipes-core/images/image-hvmpd-dev.bb
index ed15947..06e3ff6 100644 (file)
--- a/recipes-core/images/image-hvmpd-dev.bb
+++ b/recipes-core/images/image-hvmpd-dev.bb
@@ -1,6 +1,6 @@
 SUMMARY = "HV MPD development image"
 
-require image-hvmpd-common.inc
+require include/image-hvmpd-common.inc
 
 # Image suitable for development (empty root password):
 IMAGE_FEATURES += "debug-tweaks"

diff --git a/recipes-core/images/image-hvmpd-prod.bb b/recipes-core/images/image-hvmpd-prod.bb
index b5ac0cb..69d5098 100644 (file)
--- a/recipes-core/images/image-hvmpd-prod.bb
+++ b/recipes-core/images/image-hvmpd-prod.bb
@@ -1,3 +1,3 @@
 SUMMARY = "HV MPD production image"
 
-require image-hvmpd-common.inc
+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
new file mode 100644 (file)
index 0000000..0e901ef
--- /dev/null
+++ b/recipes-core/images/include/image-hvmpd-common.inc
@@ -0,0 +1,54 @@
+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 \
+"
+
+# Music server specific features/components:
+IMAGE_INSTALL:append = " \
+       alsa-utils \
+       mpd \
+       mpc \
+       ympd \
+       shairport-sync \
+"
+
+# Needed by shairport-sync:
+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 \
+"
+
+# 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"