recipes-core: Reorder console-image and console-dev-image

conf/layer.conf

@@ -11,5 +11,5 @@ BBFILE_COLLECTIONS += "meta-blackfinn"
 BBFILE_PATTERN_meta-blackfinn = "^${LAYERDIR}/"
 BBFILE_PRIORITY_meta-blackfinn = "11"
 
-LAYERSERIES_COMPAT_meta-blackfinn = "thud sumo rocko"
+LAYERSERIES_COMPAT_meta-blackfinn = "zeus warrior thud sumo rocko"
 

recipes-core/images/console-dev-image.bb

@@ -2,104 +2,16 @@ SUMMARY = "A console image with some additional tools"
 HOMEPAGE = "https://blackfinn.de"
 LICENSE = "MIT"
 
-inherit core-image extrausers
+require console-image-base.inc
 
-IMAGE_FEATURES += "package-management"
+DEV_SDK_INSTALL += " \
-
-# Encrypt the password with: echo "<password>" | openssl passwd -1 -stdin
-EXTRA_USERS_PARAMS = " \
-    usermod -p '\$1\$4h5Qdc3i\$Vke4J2Ci5z.D3TtFDmV9r/' root; \
-    useradd -p '\$1\$4h5Qdc3i\$Vke4J2Ci5z.D3TtFDmV9r/' tkl; \
-"
-
-CORE_OS = " \
-    openssh \
-    openssh-keygen \
-    openssh-sftp-server \
-    psplash \
-    tzdata \
-"
-
-KERNEL_EXTRA_INSTALL = " \
-    kernel-modules \
- "
-
-WIFI_SUPPORT = " \
-    iw \
-    wpa-supplicant \
- "
-
-DEV_SDK_INSTALL = " \
-    file \
     git \
     make \
-    perl-modules \
-    pkgconfig \
-    python-modules \
     python-pip \
     python-dev \
     bash \
- "
-
-EXTRA_TOOLS_INSTALL = " \
-    acpid \
-    bc \
-    bzip2 \
-    dosfstools \
-    e2fsprogs-mke2fs \
-    ethtool \
-    findutils \
-    htop \
-    i2c-tools \
-    less \
-    mc \
-    procps \
-    rsync \
-    sysfsutils \
-    unzip \
-    util-linux \
-    util-linux-blkid \
-    vim \
-    wget \
-    curl \
-    zip \
-    ntp \
- "
-
-MQTT = " \
-    python-paho-mqtt \
-"
-
-PYTHON_LIBS = " \
-    python-smbus \
-"
-
-IMAGE_INSTALL += " \
-    ${CORE_OS} \
-    ${DEV_SDK_INSTALL} \
-    ${EXTRA_TOOLS_INSTALL} \
-    ${KERNEL_EXTRA_INSTALL} \
-    ${WIFI_SUPPORT} \
-    ${MQTT} \
-    ${PYTHON_LIBS} \
     packagegroup-core-buildessential \
 "
 
-IMAGE_INSTALL_append_beaglebone-yocto = " linux-firmware-rtl8192cu"
-IMAGE_INSTALL_append_bananapi-m3 += " linux-firmware-bcm43430"
-
-set_local_timezone() {
-    ln -sf /usr/share/zoneinfo/Europe/Berlin ${IMAGE_ROOTFS}/etc/localtime
-}
-
-disable_bootlogd() {
-    echo BOOTLOGD_ENABLE=no > ${IMAGE_ROOTFS}/etc/default/bootlogd
-}
-
-ROOTFS_POSTPROCESS_COMMAND += " \
-    set_local_timezone ; \
-    disable_bootlogd ; \
- "
-
 export IMAGE_BASENAME = "console-dev-image"
 

recipes-core/images/console-image-base.inc

@@ -0,0 +1,92 @@
+inherit core-image extrausers
+
+IMAGE_FEATURES += "package-management"
+
+# Encrypt the password with: echo "<password>" | openssl passwd -1 -stdin
+EXTRA_USERS_PARAMS = " \
+    usermod -p '\$1\$4h5Qdc3i\$Vke4J2Ci5z.D3TtFDmV9r/' root; \
+    useradd -p '\$1\$4h5Qdc3i\$Vke4J2Ci5z.D3TtFDmV9r/' tkl; \
+"
+
+CORE_OS = " \
+    openssh \
+    openssh-keygen \
+    openssh-sftp-server \
+    psplash \
+    tzdata \
+"
+
+KERNEL_EXTRA_INSTALL = " \
+    kernel-modules \
+ "
+
+WIFI_SUPPORT = " \
+    iw \
+    wpa-supplicant \
+ "
+
+DEV_SDK_INSTALL = " \
+    file \
+    perl-modules \
+    pkgconfig \
+    python-modules \
+ "
+
+EXTRA_TOOLS_INSTALL = " \
+    acpid \
+    bc \
+    bzip2 \
+    dosfstools \
+    e2fsprogs-mke2fs \
+    ethtool \
+    findutils \
+    htop \
+    i2c-tools \
+    less \
+    mc \
+    procps \
+    rsync \
+    sysfsutils \
+    unzip \
+    util-linux \
+    util-linux-blkid \
+    vim \
+    wget \
+    curl \
+    zip \
+    ntp \
+ "
+
+MQTT = " \
+    python-paho-mqtt \
+"
+
+PYTHON_LIBS = " \
+"
+
+IMAGE_INSTALL += " \
+    ${CORE_OS} \
+    ${DEV_SDK_INSTALL} \
+    ${EXTRA_TOOLS_INSTALL} \
+    ${KERNEL_EXTRA_INSTALL} \
+    ${WIFI_SUPPORT} \
+    ${MQTT} \
+    ${PYTHON_LIBS} \
+"
+
+IMAGE_INSTALL_append_beaglebone-yocto = " linux-firmware-rtl8192cu"
+IMAGE_INSTALL_append_bananapi-m3 += " linux-firmware-bcm43430"
+
+set_local_timezone() {
+    ln -sf /usr/share/zoneinfo/Europe/Berlin ${IMAGE_ROOTFS}/etc/localtime
+}
+
+disable_bootlogd() {
+    echo BOOTLOGD_ENABLE=no > ${IMAGE_ROOTFS}/etc/default/bootlogd
+}
+
+ROOTFS_POSTPROCESS_COMMAND += " \
+    set_local_timezone ; \
+    disable_bootlogd ; \
+ "
+

recipes-core/images/console-image.bb

@@ -2,99 +2,7 @@ SUMMARY = "A console image with some additional tools"
 HOMEPAGE = "https://blackfinn.de"
 LICENSE = "MIT"
 
-inherit core-image extrausers
+require console-image-base.inc
-
-IMAGE_FEATURES += "package-management"
-
-# Encrypt the password with: echo "<password>" | openssl passwd -1 -stdin
-EXTRA_USERS_PARAMS = " \
-    usermod -p '\$1\$4h5Qdc3i\$Vke4J2Ci5z.D3TtFDmV9r/' root; \
-    useradd -p '\$1\$4h5Qdc3i\$Vke4J2Ci5z.D3TtFDmV9r/' tkl; \
-"
-
-CORE_OS = " \
-    openssh \
-    openssh-keygen \
-    openssh-sftp-server \
-    psplash \
-    tzdata \
-"
-
-KERNEL_EXTRA_INSTALL = " \
-    kernel-modules \
- "
-
-WIFI_SUPPORT = " \
-    iw \
-    wpa-supplicant \
- "
-
-DEV_SDK_INSTALL = " \
-    file \
-    git \
-    make \
-    perl-modules \
-    pkgconfig \
-    python-modules \
- "
-
-EXTRA_TOOLS_INSTALL = " \
-    acpid \
-    bc \
-    bzip2 \
-    dosfstools \
-    e2fsprogs-mke2fs \
-    ethtool \
-    findutils \
-    htop \
-    i2c-tools \
-    less \
-    mc \
-    procps \
-    rsync \
-    sysfsutils \
-    unzip \
-    util-linux \
-    util-linux-blkid \
-    vim \
-    wget \
-    curl \
-    zip \
-    ntp \
- "
-
-MQTT = " \
-    python-paho-mqtt \
-"
-
-PYTHON_LIBS = " \
-"
-
-IMAGE_INSTALL += " \
-    ${CORE_OS} \
-    ${DEV_SDK_INSTALL} \
-    ${EXTRA_TOOLS_INSTALL} \
-    ${KERNEL_EXTRA_INSTALL} \
-    ${WIFI_SUPPORT} \
-    ${MQTT} \
-    ${PYTHON_LIBS} \
-"
-
-IMAGE_INSTALL_append_beaglebone-yocto = " linux-firmware-rtl8192cu"
-IMAGE_INSTALL_append_bananapi-m3 += " linux-firmware-bcm43430"
-
-set_local_timezone() {
-    ln -sf /usr/share/zoneinfo/Europe/Berlin ${IMAGE_ROOTFS}/etc/localtime
-}
-
-disable_bootlogd() {
-    echo BOOTLOGD_ENABLE=no > ${IMAGE_ROOTFS}/etc/default/bootlogd
-}
-
-ROOTFS_POSTPROCESS_COMMAND += " \
-    set_local_timezone ; \
-    disable_bootlogd ; \
- "
 
 export IMAGE_BASENAME = "console-image"