From 4b8acff6b4765e4368c126dd881a4ed9f40a7992 Mon Sep 17 00:00:00 2001 From: Stefan Eichenberger Date: Tue, 11 Jul 2017 10:55:37 +0200 Subject: [PATCH] nbhw16: remove internal only recipes --- conf/machine/am335x-nbhw16-fct.conf | 8 - conf/machine/am335x-nbhw16.conf | 2 +- recipes-asterisk/asterisk/asterisk_%.bbappend | 1 - .../u-boot/u-boot-am335x-nbhw16-v1_git.bb | 18 -- .../u-boot/u-boot-am335x-nbhw16-v2_git.bb | 18 -- .../u-boot/u-boot-fw-utils/fw_env.config | 9 - recipes-bsp/u-boot/u-boot-fw-utils_%.bbappend | 7 - recipes-bsp/u-boot/u-boot-nm.inc | 286 ------------------ recipes-connectivity/node-mqtt/node-mqtt.bb | 18 -- .../dahdi-linux/dahdi-linux_%.bbappend | 9 - 10 files changed, 1 insertion(+), 375 deletions(-) delete mode 100644 conf/machine/am335x-nbhw16-fct.conf delete mode 100644 recipes-asterisk/asterisk/asterisk_%.bbappend delete mode 100644 recipes-bsp/u-boot/u-boot-am335x-nbhw16-v1_git.bb delete mode 100644 recipes-bsp/u-boot/u-boot-am335x-nbhw16-v2_git.bb delete mode 100644 recipes-bsp/u-boot/u-boot-fw-utils/fw_env.config delete mode 100644 recipes-bsp/u-boot/u-boot-fw-utils_%.bbappend delete mode 100644 recipes-bsp/u-boot/u-boot-nm.inc delete mode 100644 recipes-connectivity/node-mqtt/node-mqtt.bb delete mode 100644 recipes-kernel/dahdi-linux/dahdi-linux_%.bbappend diff --git a/conf/machine/am335x-nbhw16-fct.conf b/conf/machine/am335x-nbhw16-fct.conf deleted file mode 100644 index 85bc3c5..0000000 --- a/conf/machine/am335x-nbhw16-fct.conf +++ /dev/null @@ -1,8 +0,0 @@ -#@TYPE: Machine -#@NAME: BeagleBone machine -#@DESCRIPTION: Machine configuration for the http://beagleboard.org/bone board - -require conf/machine/am335x-nbhw16.conf - -KERNEL_DEFCONFIG = "nbhw16_fct_defconfig" - diff --git a/conf/machine/am335x-nbhw16.conf b/conf/machine/am335x-nbhw16.conf index 80b6ef4..a81f481 100644 --- a/conf/machine/am335x-nbhw16.conf +++ b/conf/machine/am335x-nbhw16.conf @@ -19,6 +19,6 @@ KERNEL_DEVICETREE = "am335x-nbhw16.dtb \ KERNEL_IMAGETYPE = "zImage" PREFERRED_PROVIDER_virtual/kernel = "linux-netmodule" -BRANCH_pn-linux-netmodule = "nbhw16-4.4" PV_pn-linux-netmodule = "4.4-${SRCPV}" +SRC_URI_pn-linux-netmodule = "git://git@gitlab.com/eichest/linux.git;protocol=ssh;branch=nbhw16-4.4" diff --git a/recipes-asterisk/asterisk/asterisk_%.bbappend b/recipes-asterisk/asterisk/asterisk_%.bbappend deleted file mode 100644 index afca922..0000000 --- a/recipes-asterisk/asterisk/asterisk_%.bbappend +++ /dev/null @@ -1 +0,0 @@ -PACKAGECONFIG_append = " dahdi tonezone gsm" diff --git a/recipes-bsp/u-boot/u-boot-am335x-nbhw16-v1_git.bb b/recipes-bsp/u-boot/u-boot-am335x-nbhw16-v1_git.bb deleted file mode 100644 index 103385f..0000000 --- a/recipes-bsp/u-boot/u-boot-am335x-nbhw16-v1_git.bb +++ /dev/null @@ -1,18 +0,0 @@ -# Force machine configuration for this recipe -UBOOT_MACHINE = "am335x_nbhw16_defconfig" - -require u-boot-nm.inc - -SRC_URI = "git://gitolite@git/usr/se/u-boot;protocol=ssh;branch=nbhw16-2016.04" - -SRCREV ?= "${AUTOREV}" -PV = "v2016.04+git${SRCPV}" - -SPL_BINARY = "MLO" -UBOOT_SUFFIX = "img" - -do_deploy_append() { - cp ${S}/spl/u-boot-spl.bin ${DEPLOYDIR}/${PN}-spl.bin - cp ${S}/u-boot.bin ${DEPLOYDIR}/${PN}.bin -} - diff --git a/recipes-bsp/u-boot/u-boot-am335x-nbhw16-v2_git.bb b/recipes-bsp/u-boot/u-boot-am335x-nbhw16-v2_git.bb deleted file mode 100644 index 5d2fd4c..0000000 --- a/recipes-bsp/u-boot/u-boot-am335x-nbhw16-v2_git.bb +++ /dev/null @@ -1,18 +0,0 @@ -# Force machine configuration for this recipe -UBOOT_MACHINE = "am335x_nbhw16_v2_defconfig" - -require u-boot-nm.inc - -SRC_URI = "git://gitolite@git/usr/se/u-boot;protocol=ssh;branch=nbhw16-2016.04" - -SRCREV ?= "${AUTOREV}" -PV = "v2016.04+git${SRCPV}" - -SPL_BINARY = "MLO" -UBOOT_SUFFIX = "img" - -do_deploy_append() { - cp ${S}/spl/u-boot-spl.bin ${DEPLOYDIR}/${PN}-spl.bin - cp ${S}/u-boot.bin ${DEPLOYDIR}/${PN}.bin -} - diff --git a/recipes-bsp/u-boot/u-boot-fw-utils/fw_env.config b/recipes-bsp/u-boot/u-boot-fw-utils/fw_env.config deleted file mode 100644 index f3363b9..0000000 --- a/recipes-bsp/u-boot/u-boot-fw-utils/fw_env.config +++ /dev/null @@ -1,9 +0,0 @@ -# Configuration file for fw_(printenv/setenv) utility. -# Up to two entries are valid, in this case the redundant -# environment sector is assumed present. -# Notice, that the "Number of sectors" is ignored on NOR and SPI-dataflash. -# Futhermore, if the Flash sector size is ommitted, this value is assumed to -# be the same as the Environment size, which is valid for NOR and SPI-dataflash - -# MTD device name Device offset Environment size -/sys/bus/i2c/devices/0-0050/eeprom 0x1000 0x0800 diff --git a/recipes-bsp/u-boot/u-boot-fw-utils_%.bbappend b/recipes-bsp/u-boot/u-boot-fw-utils_%.bbappend deleted file mode 100644 index 2cb8d2c..0000000 --- a/recipes-bsp/u-boot/u-boot-fw-utils_%.bbappend +++ /dev/null @@ -1,7 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -SRC_URI += "file://fw_env.config" - -do_install_prepend() { - cp -f ${WORKDIR}/fw_env.config ${S}/tools/env/ -} diff --git a/recipes-bsp/u-boot/u-boot-nm.inc b/recipes-bsp/u-boot/u-boot-nm.inc deleted file mode 100644 index 2c31c58..0000000 --- a/recipes-bsp/u-boot/u-boot-nm.inc +++ /dev/null @@ -1,286 +0,0 @@ -SUMMARY = "Universal Boot Loader for embedded devices" -HOMEPAGE = "http://www.denx.de/wiki/U-Boot/WebHome" - -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://Licenses/README;md5=a2c678cfd4a4d97135585cad908541c6" - -S = "${WORKDIR}/git" - -PACKAGE_ARCH = "${MACHINE_ARCH}" - -inherit uboot-config deploy - -EXTRA_OEMAKE = 'CROSS_COMPILE=${TARGET_PREFIX} CC="${TARGET_PREFIX}gcc ${TOOLCHAIN_OPTIONS}" V=1' -EXTRA_OEMAKE += 'HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}"' - -PACKAGECONFIG ??= "openssl" -# u-boot will compile its own tools during the build, with specific -# configurations (aka when CONFIG_FIT_SIGNATURE is enabled) openssl is needed as -# a host build dependency. -PACKAGECONFIG[openssl] = ",,openssl-native" - -# Allow setting an additional version string that will be picked up by the -# u-boot build system and appended to the u-boot version. If the .scmversion -# file already exists it will not be overwritten. -UBOOT_LOCALVERSION ?= "" - -# Some versions of u-boot use .bin and others use .img. By default use .bin -# but enable individual recipes to change this value. -UBOOT_SUFFIX ??= "bin" -UBOOT_IMAGE ?= "u-boot-${MACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}" -UBOOT_BINARY ?= "u-boot.${UBOOT_SUFFIX}" -UBOOT_SYMLINK ?= "${PN}.${UBOOT_SUFFIX}" -UBOOT_MAKE_TARGET ?= "all" - -# Output the ELF generated. Some platforms can use the ELF file and directly -# load it (JTAG booting, QEMU) additionally the ELF can be used for debugging -# purposes. -UBOOT_ELF ?= "" -UBOOT_ELF_SUFFIX ?= "elf" -UBOOT_ELF_IMAGE ?= "u-boot-${MACHINE}-${PV}-${PR}.${UBOOT_ELF_SUFFIX}" -UBOOT_ELF_BINARY ?= "u-boot.${UBOOT_ELF_SUFFIX}" -UBOOT_ELF_SYMLINK ?= "u-boot-${MACHINE}.${UBOOT_ELF_SUFFIX}" - -# Some versions of u-boot build an SPL (Second Program Loader) image that -# should be packaged along with the u-boot binary as well as placed in the -# deploy directory. For those versions they can set the following variables -# to allow packaging the SPL. -SPL_BINARY ?= "" -SPL_IMAGE ?= "${SPL_BINARY}-${MACHINE}-${PV}-${PR}" -SPL_SYMLINK ?= "${SPL_BINARY}-${PN}" - -# Additional environment variables or a script can be installed alongside -# u-boot to be used automatically on boot. This file, typically 'uEnv.txt' -# or 'boot.scr', should be packaged along with u-boot as well as placed in the -# deploy directory. Machine configurations needing one of these files should -# include it in the SRC_URI and set the UBOOT_ENV parameter. -UBOOT_ENV_SUFFIX ?= "txt" -UBOOT_ENV ?= "" -UBOOT_ENV_BINARY ?= "${UBOOT_ENV}.${UBOOT_ENV_SUFFIX}" -UBOOT_ENV_IMAGE ?= "${UBOOT_ENV}-${MACHINE}-${PV}-${PR}.${UBOOT_ENV_SUFFIX}" -UBOOT_ENV_SYMLINK ?= "${UBOOT_ENV}-${MACHINE}.${UBOOT_ENV_SUFFIX}" - -do_compile () { - if [ "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', 'ld-is-gold', '', d)}" = "ld-is-gold" ] ; then - sed -i 's/$(CROSS_COMPILE)ld$/$(CROSS_COMPILE)ld.bfd/g' config.mk - fi - - unset LDFLAGS - unset CFLAGS - unset CPPFLAGS - - if [ ! -e ${B}/.scmversion -a ! -e ${S}/.scmversion ] - then - echo ${UBOOT_LOCALVERSION} > ${B}/.scmversion - echo ${UBOOT_LOCALVERSION} > ${S}/.scmversion - fi - - if [ "x${UBOOT_CONFIG}" != "x" ] - then - for config in ${UBOOT_MACHINE}; do - i=`expr $i + 1`; - for type in ${UBOOT_CONFIG}; do - j=`expr $j + 1`; - if [ $j -eq $i ] - then - oe_runmake O=${config} ${config} - oe_runmake O=${config} ${UBOOT_MAKE_TARGET} - cp ${S}/${config}/${UBOOT_BINARY} ${S}/${config}/u-boot-${type}.${UBOOT_SUFFIX} - fi - done - unset j - done - unset i - else - oe_runmake ${UBOOT_MACHINE} - oe_runmake ${UBOOT_MAKE_TARGET} - fi - -} - -do_install () { - if [ "x${UBOOT_CONFIG}" != "x" ] - then - for config in ${UBOOT_MACHINE}; do - i=`expr $i + 1`; - for type in ${UBOOT_CONFIG}; do - j=`expr $j + 1`; - if [ $j -eq $i ] - then - install -d ${D}/boot - install ${S}/${config}/u-boot-${type}.${UBOOT_SUFFIX} ${D}/boot/u-boot-${type}-${PV}-${PR}.${UBOOT_SUFFIX} - ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_SUFFIX} ${D}/boot/${UBOOT_BINARY}-${type} - ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_SUFFIX} ${D}/boot/${UBOOT_BINARY} - fi - done - unset j - done - unset i - else - install -d ${D}/boot - install ${S}/${UBOOT_BINARY} ${D}/boot/${UBOOT_IMAGE} - ln -sf ${UBOOT_IMAGE} ${D}/boot/${UBOOT_BINARY} - fi - - if [ "x${UBOOT_ELF}" != "x" ] - then - if [ "x${UBOOT_CONFIG}" != "x" ] - then - for config in ${UBOOT_MACHINE}; do - i=`expr $i + 1`; - for type in ${UBOOT_CONFIG}; do - j=`expr $j + 1`; - if [ $j -eq $i ] - then - install ${S}/${config}/${UBOOT_ELF} ${D}/boot/u-boot-${type}-${PV}-${PR}.${UBOOT_ELF_SUFFIX} - ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_ELF_SUFFIX} ${D}/boot/${UBOOT_BINARY}-${type} - ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_ELF_SUFFIX} ${D}/boot/${UBOOT_BINARY} - fi - done - unset j - done - unset i - else - install ${S}/${UBOOT_ELF} ${D}/boot/${UBOOT_ELF_IMAGE} - ln -sf ${UBOOT_ELF_IMAGE} ${D}/boot/${UBOOT_ELF_BINARY} - fi - fi - - if [ -e ${WORKDIR}/fw_env.config ] ; then - install -d ${D}${sysconfdir} - install -m 644 ${WORKDIR}/fw_env.config ${D}${sysconfdir}/fw_env.config - fi - - if [ "x${SPL_BINARY}" != "x" ] - then - if [ "x${UBOOT_CONFIG}" != "x" ] - then - for config in ${UBOOT_MACHINE}; do - i=`expr $i + 1`; - for type in ${UBOOT_CONFIG}; do - j=`expr $j + 1`; - if [ $j -eq $i ] - then - install ${S}/${config}/${SPL_BINARY} ${D}/boot/${SPL_IMAGE}-${type}-${PV}-${PR} - ln -sf ${SPL_IMAGE}-${type}-${PV}-${PR} ${D}/boot/${SPL_BINARY}-${type} - ln -sf ${SPL_IMAGE}-${type}-${PV}-${PR} ${D}/boot/${SPL_BINARY} - fi - done - unset j - done - unset i - else - install ${S}/${SPL_BINARY} ${D}/boot/${SPL_IMAGE} - ln -sf ${SPL_IMAGE} ${D}/boot/${SPL_BINARY} - fi - fi - - if [ "x${UBOOT_ENV}" != "x" ] - then - install ${WORKDIR}/${UBOOT_ENV_BINARY} ${D}/boot/${UBOOT_ENV_IMAGE} - ln -sf ${UBOOT_ENV_IMAGE} ${D}/boot/${UBOOT_ENV_BINARY} - fi -} - -FILES_${PN} = "/boot ${sysconfdir}" -# Ensure the split debug part of any elf files are put into dbg -FILES_${PN}-dbg += "/boot/.debug" - -do_deploy () { - if [ "x${UBOOT_CONFIG}" != "x" ] - then - for config in ${UBOOT_MACHINE}; do - i=`expr $i + 1`; - for type in ${UBOOT_CONFIG}; do - j=`expr $j + 1`; - if [ $j -eq $i ] - then - install -d ${DEPLOYDIR} - install ${S}/${config}/u-boot-${type}.${UBOOT_SUFFIX} ${DEPLOYDIR}/u-boot-${type}-${PV}-${PR}.${UBOOT_SUFFIX} - cd ${DEPLOYDIR} - ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_SUFFIX} ${UBOOT_SYMLINK}-${type} - ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_SUFFIX} ${UBOOT_SYMLINK} - ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_SUFFIX} ${UBOOT_BINARY}-${type} - ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_SUFFIX} ${UBOOT_BINARY} - fi - done - unset j - done - unset i - else - install -d ${DEPLOYDIR} - install ${S}/${UBOOT_BINARY} ${DEPLOYDIR}/${UBOOT_IMAGE} - cd ${DEPLOYDIR} - rm -f ${UBOOT_BINARY} ${UBOOT_SYMLINK} - ln -sf ${UBOOT_IMAGE} ${UBOOT_SYMLINK} - ln -sf ${UBOOT_IMAGE} ${UBOOT_BINARY} - fi - - if [ "x${UBOOT_ELF}" != "x" ] - then - if [ "x${UBOOT_CONFIG}" != "x" ] - then - for config in ${UBOOT_MACHINE}; do - i=`expr $i + 1`; - for type in ${UBOOT_CONFIG}; do - j=`expr $j + 1`; - if [ $j -eq $i ] - then - install ${S}/${config}/${UBOOT_ELF} ${DEPLOYDIR}/u-boot-${type}-${PV}-${PR}.${UBOOT_ELF_SUFFIX} - ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_ELF_SUFFIX} ${DEPLOYDIR}/${UBOOT_ELF_BINARY}-${type} - ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_ELF_SUFFIX} ${DEPLOYDIR}/${UBOOT_ELF_BINARY} - ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_ELF_SUFFIX} ${DEPLOYDIR}/${UBOOT_ELF_SYMLINK}-${type} - ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_ELF_SUFFIX} ${DEPLOYDIR}/${UBOOT_ELF_SYMLINK} - fi - done - unset j - done - unset i - else - install ${S}/${UBOOT_ELF} ${DEPLOYDIR}/${UBOOT_ELF_IMAGE} - ln -sf ${UBOOT_ELF_IMAGE} ${DEPLOYDIR}/${UBOOT_ELF_BINARY} - ln -sf ${UBOOT_ELF_IMAGE} ${DEPLOYDIR}/${UBOOT_ELF_SYMLINK} - fi - fi - - - if [ "x${SPL_BINARY}" != "x" ] - then - if [ "x${UBOOT_CONFIG}" != "x" ] - then - for config in ${UBOOT_MACHINE}; do - i=`expr $i + 1`; - for type in ${UBOOT_CONFIG}; do - j=`expr $j + 1`; - if [ $j -eq $i ] - then - install ${S}/${config}/${SPL_BINARY} ${DEPLOYDIR}/${SPL_IMAGE}-${type}-${PV}-${PR} - rm -f ${DEPLOYDIR}/${SPL_BINARY} ${DEPLOYDIR}/${SPL_SYMLINK}-${type} - ln -sf ${SPL_IMAGE}-${type}-${PV}-${PR} ${DEPLOYDIR}/${SPL_BINARY}-${type} - ln -sf ${SPL_IMAGE}-${type}-${PV}-${PR} ${DEPLOYDIR}/${SPL_BINARY} - ln -sf ${SPL_IMAGE}-${type}-${PV}-${PR} ${DEPLOYDIR}/${SPL_SYMLINK}-${type} - ln -sf ${SPL_IMAGE}-${type}-${PV}-${PR} ${DEPLOYDIR}/${SPL_SYMLINK} - fi - done - unset j - done - unset i - else - install ${S}/${SPL_BINARY} ${DEPLOYDIR}/${SPL_IMAGE} - rm -f ${DEPLOYDIR}/${SPL_BINARY} ${DEPLOYDIR}/${SPL_SYMLINK} - ln -sf ${SPL_IMAGE} ${DEPLOYDIR}/${SPL_BINARY} - ln -sf ${SPL_IMAGE} ${DEPLOYDIR}/${SPL_SYMLINK} - fi - fi - - - if [ "x${UBOOT_ENV}" != "x" ] - then - install ${WORKDIR}/${UBOOT_ENV_BINARY} ${DEPLOYDIR}/${UBOOT_ENV_IMAGE} - rm -f ${DEPLOYDIR}/${UBOOT_ENV_BINARY} ${DEPLOYDIR}/${UBOOT_ENV_SYMLINK} - ln -sf ${UBOOT_ENV_IMAGE} ${DEPLOYDIR}/${UBOOT_ENV_BINARY} - ln -sf ${UBOOT_ENV_IMAGE} ${DEPLOYDIR}/${UBOOT_ENV_SYMLINK} - fi -} - -addtask deploy before do_build after do_compile diff --git a/recipes-connectivity/node-mqtt/node-mqtt.bb b/recipes-connectivity/node-mqtt/node-mqtt.bb deleted file mode 100644 index 4f896ca..0000000 --- a/recipes-connectivity/node-mqtt/node-mqtt.bb +++ /dev/null @@ -1,18 +0,0 @@ -DESCRIPTION = "MQTT Library for NodeJS" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.md;md5=261aa46f11e9a7bdbea1dea7eb8bcb6c" - -PV = "2.1.3" -PR = "r2" - -SRC_URI = "https://github.com/mqttjs/MQTT.js/archive/v2.1.3.zip;name=src" - -SRC_URI[src.md5sum] = "6013d1df7abe138c0c379fbe48be0b30" -SRC_URI[src.sha256sum] = "d848e9ff133d015dd99b30a1b26a057026deebe9328efa9f9e84e6f64c8e5608" - -RDEPENDS_${PN} = "nodejs" - -S="${WORKDIR}/MQTT.js-${PV}" - -inherit allarch npm-install-global diff --git a/recipes-kernel/dahdi-linux/dahdi-linux_%.bbappend b/recipes-kernel/dahdi-linux/dahdi-linux_%.bbappend deleted file mode 100644 index e47babb..0000000 --- a/recipes-kernel/dahdi-linux/dahdi-linux_%.bbappend +++ /dev/null @@ -1,9 +0,0 @@ -FILES_${PN}-dev_append = " \ - /usr/share/dahdi-linux/Module.symvers \ - " - -do_install_append() { - mkdir -p ${D}/usr/share/dahdi-linux/ - cp drivers/dahdi/Module.symvers ${D}/usr/share/dahdi-linux/ -} -