recipes: Fixed wrong OVERRIDES

classes/on_bootloader.bbclass

-
-
 def on_bootloader_uboot(d, a, b):
     if d.getVar('UBOOT_CONFIG') or d.getVar('UBOOT_MACHINE'):
         return a

conf/distro/guf-fngsystem.conf

@@ -6,68 +6,68 @@ DISTRO = "guf-fngsystem"
 DISTRO_NAME = "GUF Flash-N-Go-System"
 DISTROOVERRIDES = "fng"
 
-DISTRO_FEATURES_remove =  "\
-                           3g \
-                           directfb \
-                           gobject-introspection-data \
-                           ldconfig \
-                           nfc \
-                           opengl \
-                           pci \
-                           pcmcia \
-                           pulseaudio \
-                           systemd \
-                           vulkan \
-                           wifi \
-                           x11 \
-                           zeroconf \                          
-                           "
+DISTRO_FEATURES:remove ="\
+    3g \
+    directfb \
+    gobject-introspection-data \
+    ldconfig \
+    nfc \
+    opengl \
+    pci \
+    pcmcia \
+    pulseaudio \
+    systemd \
+    vulkan \
+    wifi \
+    x11 \
+    zeroconf \
+"
+
 DISTRO_FEATURES_BACKFILL_CONSIDERED += "gobject-introspection-data pulseaudio"
 
-DISTRO_FEATURES_remove += "x11 wayland"
+DISTRO_FEATURES:remove += "x11 wayland"
 
 INIT_MANAGER = "sysvinit"
-VIRTUAL-RUNTIME_dev_manager = "eudev"
+VIRTUAL-RUNTIME:dev_manager = "eudev"
 
 INITRAMFS_IMAGE_BUNDLE = "0"
 INITRAMFS_FSTYPES = "cpio.gz"
 
-MACHINE_ESSENTIAL_EXTRA_RDEPENDS_remove="   linux-firmware-imx-vpu  kernel-devicetree     kernel-image "
-RDEPENDS_${KERNEL_PACKAGE_NAME}-base = ""
-MACHINE_EXTRA_RRECOMMENDS_remove=" kernel-modules "
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS:remove="   linux-firmware-imx-vpu  kernel-devicetree     kernel-image "
+RDEPENDS:${KERNEL_PACKAGE_NAME}-base = ""
+MACHINE_EXTRA_RRECOMMENDS:remove=" kernel-modules "
 
 DISTRO_BOOT_FILES = " \
-        boot-alt.cfg \
-        ${@on_bootloader_uboot(d, 'boot-alt.scr','')} \
-        "
-
+    boot-alt.cfg \
+    ${@on_bootloader_uboot(d, 'boot-alt.scr','')} \
+"
 
-IMAGE_BOOT_FILES_append = " ${DISTRO_BOOT_FILES} "
+IMAGE_BOOT_FILES:append = " ${DISTRO_BOOT_FILES} "
 
 # The variables DISTRO_INSTALL_SCRIPTS, DISTRO_IMAGES, DISTRO_RELEASE_ARTEFACTS
 # are used by the CI to copy/or link the needed files into the release folder
 
 DISTRO_INSTALL_SCRIPTS = "fngsystem-self-update.sh fngsystem-self-init.sh "
-DISTRO_INSTALL_SCRIPTS_append_mx8 = " fng-install-uboot.sh "
+DISTRO_INSTALL_SCRIPTS:append:mx8 = " fng-install-uboot.sh "
 
 DISTRO_IMAGES = "${IMAGE_LINK_NAME}.tgz ${IMAGE_LINK_NAME}.cpio.gz"
-DISTRO_IMAGES_append_mx8 = " imx-boot.tar.gz imx-boot "
+DISTRO_IMAGES:append:mx8 = " imx-boot.tar.gz imx-boot "
 # List build results that are later handled in the CI
-DISTRO_RELEASE_ARTEFACTS_append = "${IMAGE_LINK_NAME}.md5 "
-
-DISTRO_RELEASE_ARTEFACTS_append_mx8 = " \
-        uuu \
-        uuu.exe \
-        uuu.lst \
-        \
-        ${@' '.join([ "uuu-" + dtb.split('/')[-1].split('.')[0] + '.sh' for dtb in d.getVar('KERNEL_DEVICETREE').split() ] )} \
-        ${@' '.join([ "uuu-" + dtb.split('/')[-1].split('.')[0] + '.bat' for dtb in d.getVar('KERNEL_DEVICETREE').split() ] )} \
+DISTRO_RELEASE_ARTEFACTS:append = "${IMAGE_LINK_NAME}.md5 "
+
+DISTRO_RELEASE_ARTEFACTS:append:mx8 = " \
+    uuu \
+    uuu.exe \
+    uuu.lst \
+    \
+    ${@' '.join([ "uuu-" + dtb.split('/')[-1].split('.')[0] + '.sh' for dtb in d.getVar('KERNEL_DEVICETREE').split() ] )} \
+    ${@' '.join([ "uuu-" + dtb.split('/')[-1].split('.')[0] + '.bat' for dtb in d.getVar('KERNEL_DEVICETREE').split() ] )} \
 "
 
 # Override any hostname settings
 # as this is used by install scripts to determine
 # if running in fngsystem
-hostname_pn-base-files = "FLASH-N-GO"
+hostname:pn-base-files = "FLASH-N-GO"
 
 # Udev hw-db is huge compared to the rest of the system
 # and I hope we can live wihtout it.

conf/distro/guf-wayland.conf

@@ -5,22 +5,22 @@ require conf/distro/include/guf-base.inc
 DISTRO = "guf-wayland"
 DISTRO_NAME = "GUF Wayland"
 
-DISTRO_FEATURES_remove = "bluetooth bluez5 gobject-introspection-data pulseaudio directfb x11"
+DISTRO_FEATURES:remove = "bluetooth bluez5 gobject-introspection-data pulseaudio directfb x11"
 DISTRO_FEATURES_BACKFILL_CONSIDERED += "bluetooth bluez5 gobject-introspection-data pulseaudio"
 
 # add support for wayland
-DISTRO_FEATURES_append = " wayland"
+DISTRO_FEATURES:append = " wayland"
 
 # add opengl
-DISTRO_FEATURES_append = " opengl vulkan"
+DISTRO_FEATURES:append = " opengl vulkan"
 
 
 # Default is busybox
 # Recommandation from poky/meta-poky/conf/local.conf.sample.extended
 # expect syslog which is replaced by syslog-ng
 PREFERRED_PROVIDER_virtual/base-utils = "packagegroup-core-base-utils"
-VIRTUAL-RUNTIME_base-utils = "packagegroup-core-base-utils"
-VIRTUAL-RUNTIME_base-utils-hwclock = "util-linux-hwclock"
-VIRTUAL-RUNTIME_base-utils-syslog = "syslog-ng"
-VIRTUAL-RUNTIME_vim = "vim"
+VIRTUAL-RUNTIME:base-utils = "packagegroup-core-base-utils"
+VIRTUAL-RUNTIME:base-utils-hwclock = "util-linux-hwclock"
+VIRTUAL-RUNTIME:base-utils-syslog = "syslog-ng"
+VIRTUAL-RUNTIME:vim = "vim"
 

conf/distro/include/guf-base.inc

@@ -8,23 +8,23 @@ DISTRO_VERSION = "${@d.getVar('MANIFEST_VERSION') if d.getVar('MANIFEST_VERSION'
 
 # From poky/meta-poky/conf/local.conf.sample.extended:
 INIT_MANAGER = "systemd"
-VIRTUAL-RUNTIME_dev_manager ?= "udev"
+VIRTUAL-RUNTIME:dev_manager ?= "udev"
 
 # As older fngsystem versions complain about the tar format 'warning: skipping header 'x'
 # we stay with the previous tar command. 
 # See poky/meta/classes/image_types.bbclass f79b64e35a43458bd313dd5fa5c44966d8665b07
 IMAGE_CMD_tar_forcevariable = "${IMAGE_CMD_TAR} --sort=name --format=gnu --numeric-owner -cf ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.tar -C ${IMAGE_ROOTFS} . || [ $? -eq 1 ]"
 
-WARN_QA_remove = "host-user-contaminated"
+WARN_QA:remove = "host-user-contaminated"
 
 # Log information on images and packages
 INHERIT += "buildhistory on_bootloader"
 BUILDHISTORY_COMMIT = "1"
 
 DISTRO_BOOT_FILES = " \
-        boot.cfg \
-        ${@on_bootloader_uboot(d, 'boot.scr','')} \
-        "
+    boot.cfg \
+    ${@on_bootloader_uboot(d, 'boot.scr','')} \
+"
 
 # The variables DISTRO_INSTALL_SCRIPTS, DISTRO_IMAGES, DISTRO_RELEASE_ARTEFACTS
 # are used by the CI to copy/or link the needed files into the release folder
@@ -32,20 +32,22 @@ DISTRO_INSTALL_SCRIPTS = "fng-install.sh pkg.py "
 
 # Add an entry for each FSTYPE
 DISTRO_IMAGES = "${@' '.join([ d.getVar('IMAGE_LINK_NAME') + '.' + fs for fs in d.getVar('IMAGE_FSTYPES').split() ] )}"
+
 # List build results that are later handled in the CI
-DISTRO_RELEASE_ARTEFACTS = "${DISTRO_IMAGES} \
-                            ${DISTRO_INSTALL_SCRIPTS} \
-                            "
+DISTRO_RELEASE_ARTEFACTS = " \
+    ${DISTRO_IMAGES} \
+    ${DISTRO_INSTALL_SCRIPTS} \
+"
 
 # On imx8m we currently don't have the complete config infrastructure
 # so we need to specify the devicetree to use. For this we need the files
 # additionally outside the image
-DISTRO_RELEASE_ARTEFACTS_append_mx8 = " \
-        ${@' '.join([ dtb.split('/')[-1] for dtb in d.getVar('KERNEL_DEVICETREE').split() ] )} \
-        Image \
-        "
+DISTRO_RELEASE_ARTEFACTS:append:mx8 = " \
+    ${@' '.join([ dtb.split('/')[-1] for dtb in d.getVar('KERNEL_DEVICETREE').split() ] )} \
+    Image \
+"
 
-DISTRO_EXTRA_RDEPENDS += "\
+DISTRO_EXTRA_RDEPENDS += " \
     ${DISTRO_INSTALL_SCRIPTS} \
     ${DISTRO_BOOT_FILES} \
     bootselect \

recipes-bsp/fng-install/fng-install.inc

+FILESEXTRAPATHS:append := "${THISDIR}/common:"
 
-FILESEXTRAPATHS_append := "${THISDIR}/common:"
-SRC_URI_append = " \
+SRC_URI:append = " \
     file://fnginstall-common.sh \
-    "
+"
 
-do_compile(){
+do_compile() {
     cp "${WORKDIR}/${INSTALL_SCRIPT}" "${B}/${INSTALL_SCRIPT}" 
     sed -i "${B}/${INSTALL_SCRIPT}" \
         -e 's/.*\(\.\/fnginstall-common.sh\)/#==============================\n# End of include file fnginstall-common.sh\n#==============================/' \

recipes-bsp/fng-install/prepare-image.bb

-SUMMARY = "Garz & Fricke postinstall scripts to adapt kernel, bootscripts and partitions to the current installation. Called during installation process."
-HOMEPAGE = "https://garz-fricke.com"
+SUMMARY = "SECO North post-install scripts to adapt kernel, bootscripts and partitions to the current installation. Called during the installation process."
+HOMEPAGE = "https://www.seco.com"
 
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
 
 RDEPENDS:${PN} = " \
     fng-install-postinstallation \
-    sharedconf \ 
+    sharedconf \
 "
 
 SRC_URI = " \
@@ -14,22 +14,22 @@ SRC_URI = " \
     file://gf-prepare-bootscript.sh \
     file://gf-prepare-bootpartition.sh \
     file://gf-prepare-common.sh \
-    "
+"
 
-do_configure:append_fng () {
+do_configure:append:fng () {
     # Exchange the bootpartitions for Flash-n-go System
     sed -i ${WORKDIR}/gf-prepare-kernel.sh -e 's|^BOOTPARTITIONS=".*|BOOTPARTITIONS="/dev/disk/by-label/Flash-N-Go /dev/mmcblk0p1 /dev/mmcblk1p1"|'
 }
 
 do_install() {
-	install -d ${D}${sbindir}
-	install -m 0755 ${WORKDIR}/gf-prepare-kernel.sh ${D}${sbindir}
-	install -m 0755 ${WORKDIR}/gf-prepare-bootscript.sh ${D}${sbindir}
-	install -m 0755 ${WORKDIR}/gf-prepare-bootpartition.sh ${D}${sbindir}
-	install -m 0755 ${WORKDIR}/gf-prepare-common.sh ${D}${sbindir}
+    install -d ${D}${sbindir}
+    install -m 0755 ${WORKDIR}/gf-prepare-kernel.sh ${D}${sbindir}
+    install -m 0755 ${WORKDIR}/gf-prepare-bootscript.sh ${D}${sbindir}
+    install -m 0755 ${WORKDIR}/gf-prepare-bootpartition.sh ${D}${sbindir}
+    install -m 0755 ${WORKDIR}/gf-prepare-common.sh ${D}${sbindir}
 
-	install -d ${D}${sysconfdir}/fng-postinstall
-	ln -s ${sbindir}/gf-prepare-kernel.sh ${D}${sysconfdir}/fng-postinstall/10-gf-prepare-kernel
-	ln -s ${sbindir}/gf-prepare-bootscript.sh ${D}${sysconfdir}/fng-postinstall/20-gf-prepare-bootscript
-	ln -s ${sbindir}/gf-prepare-bootpartition.sh ${D}${sysconfdir}/fng-postinstall/30-gf-prepare-bootpartition
+    install -d ${D}${sysconfdir}/fng-postinstall
+    ln -s ${sbindir}/gf-prepare-kernel.sh ${D}${sysconfdir}/fng-postinstall/10-gf-prepare-kernel
+    ln -s ${sbindir}/gf-prepare-bootscript.sh ${D}${sysconfdir}/fng-postinstall/20-gf-prepare-bootscript
+    ln -s ${sbindir}/gf-prepare-bootpartition.sh ${D}${sysconfdir}/fng-postinstall/30-gf-prepare-bootpartition
 }

recipes-bsp/images/guf-image.bb

@@ -32,7 +32,7 @@ IMAGE_INSTALL_GUF += " \
     packagegroup-guf-debug \
 "
 
-IMAGE_INSTALL_GUF:append_imx8mpguf += " \
+IMAGE_INSTALL_GUF:append:imx8mpguf += " \
     guf-show-demo2 \
 "
 

recipes-connectivity/openssh/openssh_%.bbappend

 FILESEXTRAPATHS:prepend := "${THISDIR}/openssh:"
 
-do_install:append_fng() {
-	# 1. Move the keys to shared partition, so they don't need to be generated each boot
-	# 2. Change sftp-server to build-in version of openssh
-	sed -i ${D}${sysconfdir}/ssh/sshd_config -e 's|#HostKey /etc/ssh/|HostKey /etc/shared/ssh/|'
+do_install:append:fng() {
+    # 1. Move the keys to shared partition, so they don't need to be generated each boot
+    # 2. Change sftp-server to build-in version of openssh
+    sed -i ${D}${sysconfdir}/ssh/sshd_config -e 's|#HostKey /etc/ssh/|HostKey /etc/shared/ssh/|'
 }

recipes-core/busybox/busybox_%.bbappend

 FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
-SRC_URI:append_fng += " \
+SRC_URI:append:fng = " \
     file://ifplugd.cfg \
     file://ifplugd.init \
     file://ifplugd.action \
     file://fngsystem-config.cfg \
-    "
-
+"
 
 # udhcpc is running in foreground and delays the startup
 # Make it go into background earlier
 do_prepare_config:append () {
-	sed -i 's/CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-R -b"/CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-R -b -t 1 -T 1 -v"/' ${S}/.config
-
+    sed -i 's/CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-R -b"/CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-R -b -t 1 -T 1 -v"/' ${S}/.config
 }
 
-do_install:append_fng() {
-
+do_install:append:fng() {
     #Ifplugd scripts
     install -d ${D}${sysconfdir}/init.d
     install -m 0755 ${WORKDIR}/ifplugd.init ${D}${sysconfdir}/init.d/ifplugd
@@ -25,12 +22,14 @@ do_install:append_fng() {
     install -m 0755 ${WORKDIR}/ifplugd.action ${D}${sysconfdir}/ifplugd/ifplugd.action
 }
 
-
 # Prepend as the main busybox package grabs all files left
 PACKAGES:prepend = " ${PN}-ifplugd "
 INITSCRIPT_PACKAGES:append =" ${PN}-ifplugd "
 INITSCRIPT_NAME:${PN}-ifplugd ="ifplugd"
 INITSCRIPT_PARAMS:${PN}-ifplugd ="start 90 S ."
-FILES:${PN}-ifplugd = "${sysconfdir}/ifplugd/ifplugd.action \
-        ${sysconfdir}/init.d/ifplugd \
-        ${sbindir}/ifplugd"
+
+FILES:${PN}-ifplugd = " \
+    ${sysconfdir}/ifplugd/ifplugd.action \
+    ${sysconfdir}/init.d/ifplugd \
+    ${sbindir}/ifplugd \
+"

recipes-core/systemd/systemd-serialgetty.bbappend

-
-
 # Enable autologin for FNG-System on the serial consoles
-do_install:append_fng() {
-
-	find ${D}${systemd_unitdir}/system/ \
-		-name 'serial-getty*.service' \
-		-exec \
-			sed -i -e "s|/sbin/agetty|& --skip-login --autologin root |" {} \;
+do_install:append:fng() {
+    find ${D}${systemd_unitdir}/system/ \
+        -name 'serial-getty*.service' \
+        -exec \
+        sed -i -e "s|/sbin/agetty|& --skip-login --autologin root |" {} \;
 }

recipes-core/sysvinit/sysvinit-inittab_%.bbappend

-
-
-do_install:append_fng() {
+do_install:append:fng() {
    # enable autologin in fngsystem
    sed  -i ${D}/${base_bindir}/start_getty -e 's|${setsid:-}.*${getty}| & --autologin root  |'
    sed  -i ${D}/${sysconfdir}/inittab -e 's|.*getty.*tty1.*|# &|'

recipes-guf/sharedconf/sharedconf.bb

-SUMMARY = "Garz & Fricke shared configuration script for xml config files"
-HOMEPAGE = "https://garz-fricke.com"
+SUMMARY = "SECO North shared configuration script for xml config files"
+HOMEPAGE = "https://www.seco.com"
 
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
@@ -8,28 +8,28 @@ inherit systemd
 inherit update-rc.d
 
 SRC_URI = " \
-           file://config-default-eth1.xml;subdir=${S} \
-           file://config-default-wlan0-ap.xml;subdir=${S} \
-           file://config-default-wlan0.xml;subdir=${S} \
-           file://config-default.xml;subdir=${S} \
-           file://gf-conf-reader.sh;subdir=${S} \
-           file://gf-functions.sh;subdir=${S} \
-           file://gf-network-conf.init;subdir=${S} \
-           file://gf-network-conf.service;subdir=${S} \
-           file://gf-network-conf.sh;subdir=${S} \
-           file://gf-shared-remount.init;subdir=${S} \
-           file://gf-versions.sh;subdir=${S} \
-           file://lan9500a-eeprom.bin;subdir=${S} \
-           file://lan9514-eeprom.bin;subdir=${S} \
-           file://lan95xx-init-eeprom.sh;subdir=${S} \
-           file://lan95xx-set-mac.sh;subdir=${S} \
-           file://lan95xx-set-serial.sh;subdir=${S} \
-           file://mac2serial.sh;subdir=${S} \
-           file://mask2cidr.sh;subdir=${S} \
-           file://sconfig-init;subdir=${S} \
-           file://serial2mac.sh;subdir=${S} \
-           file://sharedconf.rules;subdir=${S} \
-           "
+    file://config-default-eth1.xml;subdir=${S} \
+    file://config-default-wlan0-ap.xml;subdir=${S} \
+    file://config-default-wlan0.xml;subdir=${S} \
+    file://config-default.xml;subdir=${S} \
+    file://gf-conf-reader.sh;subdir=${S} \
+    file://gf-functions.sh;subdir=${S} \
+    file://gf-network-conf.init;subdir=${S} \
+    file://gf-network-conf.service;subdir=${S} \
+    file://gf-network-conf.sh;subdir=${S} \
+    file://gf-shared-remount.init;subdir=${S} \
+    file://gf-versions.sh;subdir=${S} \
+    file://lan9500a-eeprom.bin;subdir=${S} \
+    file://lan9514-eeprom.bin;subdir=${S} \
+    file://lan95xx-init-eeprom.sh;subdir=${S} \
+    file://lan95xx-set-mac.sh;subdir=${S} \
+    file://lan95xx-set-serial.sh;subdir=${S} \
+    file://mac2serial.sh;subdir=${S} \
+    file://mask2cidr.sh;subdir=${S} \
+    file://sconfig-init;subdir=${S} \
+    file://serial2mac.sh;subdir=${S} \
+    file://sharedconf.rules;subdir=${S} \
+"
 
 PACKAGES += " ${PN}-network ${PN}-showversion "
 RDEPENDS:${PN} = " xmlstarlet "
@@ -96,7 +96,6 @@ do_install() {
     install -m 0644  ${S}/config-default-eth1.xml     ${D}/usr/share/sharedconf/
     install -m 0644  ${S}/config-default-wlan0.xml    ${D}/usr/share/sharedconf/
     install -m 0644  ${S}/config-default-wlan0-ap.xml ${D}/usr/share/sharedconf/
-
 }
 
 pkg_postinst_ontarget:${PN}-network_guf () {
@@ -105,30 +104,30 @@ pkg_postinst_ontarget:${PN}-network_guf () {
 }
 
 FILES:${PN} = " \
-        ${sbindir}/gf-conf-reader.sh \
-        ${sbindir}/gf-functions.sh \
-        ${sbindir}/gf-versions.sh \
-        ${sbindir}/serial2mac.sh \
-        ${sbindir}/mac2serial.sh \
-        ${sbindir}/sconfig \
-        ${sysconfdir}/fng-postinstall/sconfig-init \
-        ${sysconfdir}/init.d/gf-shared-remount \
-        ${sysconfdir}/shared \
-        ${sysconfdir}/udev/** \
-        ${systemd_system_unitdir}/** \
-        /usr/share/sharedconf/* \
-        "
+    ${sbindir}/gf-conf-reader.sh \
+    ${sbindir}/gf-functions.sh \
+    ${sbindir}/gf-versions.sh \
+    ${sbindir}/serial2mac.sh \
+    ${sbindir}/mac2serial.sh \
+    ${sbindir}/sconfig \
+    ${sysconfdir}/fng-postinstall/sconfig-init \
+    ${sysconfdir}/init.d/gf-shared-remount \
+    ${sysconfdir}/shared \
+    ${sysconfdir}/udev/** \
+    ${systemd_system_unitdir}/** \
+    /usr/share/sharedconf/* \
+"
 
 FILES:${PN}-network = " \
-        ${sbindir}/gf-network-conf.sh \
-        ${sbindir}/lan95xx-init-eeprom.sh \
-        ${sbindir}/lan95xx-set-mac.sh \
-        ${sbindir}/lan95xx-set-serial.sh \
-        ${sbindir}/mask2cidr.sh \
-        ${sysconfdir}/init.d/gf-network-conf \
-        ${sysconfdir}/lan9500a-eeprom.bin \
-        ${sysconfdir}/lan9514-eeprom.bin \
-        "
+    ${sbindir}/gf-network-conf.sh \
+    ${sbindir}/lan95xx-init-eeprom.sh \
+    ${sbindir}/lan95xx-set-mac.sh \
+    ${sbindir}/lan95xx-set-serial.sh \
+    ${sbindir}/mask2cidr.sh \
+    ${sysconfdir}/init.d/gf-network-conf \
+    ${sysconfdir}/lan9500a-eeprom.bin \
+    ${sysconfdir}/lan9514-eeprom.bin \
+"
 
 INITSCRIPT_PACKAGES="${PN}-network ${PN}"
 
@@ -139,15 +138,15 @@ INITSCRIPT_NAME:${PN}-network="gf-network-conf"
 INITSCRIPT_PARAMS:${PN}-network="start 80 S ."
 
 # Service file to enable in fngsystem
-SYSTEMD_SERVICE:${PN}_fng = "gf-network-conf.service"
+SYSTEMD_SERVICE:${PN}:fng = "gf-network-conf.service"
 
 FILES:${PN}-showversion = " \
-        ${sbindir}/showversion \
-        ${sysconfdir}/init.d/showversion \
-        "
+    ${sbindir}/showversion \
+    ${sysconfdir}/init.d/showversion \
+"
 
 # We need the init.d showversion entry, 
 # don't delete it (systemd normally does it with this function)
-python rm_sysvinit_initddir (){
+python rm_sysvinit_initddir () {
     pass
 }

recipes-support/nano/nano_%.bbappend

-
 # 'file' takes a lot of space but nano does not seem to really need it
-DEPENDS:remove_fng = " file "
+DEPENDS:remove:fng = " file "