diff options
Diffstat (limited to 'meta-skeleton')
10 files changed, 13 insertions, 77 deletions
diff --git a/meta-skeleton/conf/layer.conf b/meta-skeleton/conf/layer.conf index 1cb0ca1f30..963d2d5ce9 100644 --- a/meta-skeleton/conf/layer.conf +++ b/meta-skeleton/conf/layer.conf @@ -14,4 +14,4 @@ LAYERVERSION_skeleton = "1" LAYERDEPENDS_skeleton = "core" -LAYERSERIES_COMPAT_skeleton = "honister" +LAYERSERIES_COMPAT_skeleton = "styhead" diff --git a/meta-skeleton/recipes-baremetal/baremetal-examples/baremetal-helloworld_git.bb b/meta-skeleton/recipes-baremetal/baremetal-examples/baremetal-helloworld_git.bb deleted file mode 100644 index d11e2e530e..0000000000 --- a/meta-skeleton/recipes-baremetal/baremetal-examples/baremetal-helloworld_git.bb +++ /dev/null @@ -1,53 +0,0 @@ -SUMMARY = "Baremetal examples to work with the several QEMU architectures supported on OpenEmbedded" -HOMEPAGE = "https://github.com/aehs29/baremetal-helloqemu" -DESCRIPTION = "These are introductory examples to showcase the use of QEMU to run baremetal applications." -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=39346640a23c701e4f459e05f56f4449" - -SRCREV = "31b4e5a337018b4a00a7426b0e5ed83b81df30c7" -PV = "0.1+git${SRCPV}" - -SRC_URI = "git://github.com/aehs29/baremetal-helloqemu.git;protocol=https;branch=master" - -S = "${WORKDIR}/git" - -# The following variables should be set to accomodate each application -BAREMETAL_BINNAME ?= "hello_baremetal_${MACHINE}" -IMAGE_LINK_NAME ?= "baremetal-helloworld-image-${MACHINE}" -IMAGE_NAME_SUFFIX ?= "" - -# Baremetal-Image creates the proper wiring, assumes the output is provided in -# binary and ELF format, installed on ${base_libdir}/firmware/ , we want a -# package to be created since we might have some way of updating the baremetal -# firmware from Linux -inherit baremetal-image - - -# These parameters are app specific for this example -# This will be translated automatically to the architecture and -# machine that QEMU uses on OE, e.g. -machine virt -cpu cortex-a57 -# but the examples can also be run on other architectures/machines -# such as vexpress-a15 by overriding the setting on the machine.conf -COMPATIBLE_MACHINE = "qemuarmv5|qemuarm|qemuarm64|qemuriscv64|qemuriscv32" - -BAREMETAL_QEMUARCH ?= "" -BAREMETAL_QEMUARCH:qemuarmv5 = "versatile" -BAREMETAL_QEMUARCH:qemuarm = "arm" -BAREMETAL_QEMUARCH:qemuarm64 = "aarch64" -BAREMETAL_QEMUARCH:qemuriscv64 = "riscv64" -BAREMETAL_QEMUARCH:qemuriscv32 = "riscv32" - -EXTRA_OEMAKE:append = " QEMUARCH=${BAREMETAL_QEMUARCH} V=1" - - -# Install binaries on the proper location for baremetal-image to fetch and deploy -do_install(){ - install -d ${D}/${base_libdir}/firmware - install -m 755 ${B}/build/hello_baremetal_${BAREMETAL_QEMUARCH}.bin ${D}/${base_libdir}/firmware/${BAREMETAL_BINNAME}.bin - install -m 755 ${B}/build/hello_baremetal_${BAREMETAL_QEMUARCH}.elf ${D}/${base_libdir}/firmware/${BAREMETAL_BINNAME}.elf -} - -FILES:${PN} += " \ - ${base_libdir}/firmware/${BAREMETAL_BINNAME}.bin \ - ${base_libdir}/firmware/${BAREMETAL_BINNAME}.elf \ -" diff --git a/meta-skeleton/recipes-core/busybox/busybox_%.bbappend b/meta-skeleton/recipes-core/busybox/busybox_%.bbappend index 621c94f651..3c936eb713 100644 --- a/meta-skeleton/recipes-core/busybox/busybox_%.bbappend +++ b/meta-skeleton/recipes-core/busybox/busybox_%.bbappend @@ -8,6 +8,6 @@ # http://www.yoctoproject.org/docs/current/kernel-dev/kernel-dev.html#changing-the-configuration FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" -SRC_URI:append:mydistro += " \ +SRC_URI:append:mydistro = " \ file://no_rfkill.cfg \ " diff --git a/meta-skeleton/recipes-kernel/hello-mod/files/hello.c b/meta-skeleton/recipes-kernel/hello-mod/files/hello.c index 6b73a79524..4f73455d20 100644 --- a/meta-skeleton/recipes-kernel/hello-mod/files/hello.c +++ b/meta-skeleton/recipes-kernel/hello-mod/files/hello.c @@ -2,18 +2,7 @@ * * Copyright (C) 2011 Intel Corporation. All rights reserved. * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See - * the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * SPDX-License-Identifier: GPL-2.0-only * *****************************************************************************/ diff --git a/meta-skeleton/recipes-kernel/hello-mod/hello-mod_0.1.bb b/meta-skeleton/recipes-kernel/hello-mod/hello-mod_0.1.bb index 4a84a9fad8..a2fb212a68 100644 --- a/meta-skeleton/recipes-kernel/hello-mod/hello-mod_0.1.bb +++ b/meta-skeleton/recipes-kernel/hello-mod/hello-mod_0.1.bb @@ -1,6 +1,6 @@ SUMMARY = "Example of how to build an external Linux kernel module" DESCRIPTION = "${SUMMARY}" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e" inherit module diff --git a/meta-skeleton/recipes-kernel/linux/linux-yocto-custom.bb b/meta-skeleton/recipes-kernel/linux/linux-yocto-custom.bb index 6062f8422c..0879bb17b9 100644 --- a/meta-skeleton/recipes-kernel/linux/linux-yocto-custom.bb +++ b/meta-skeleton/recipes-kernel/linux/linux-yocto-custom.bb @@ -7,7 +7,7 @@ SUMMARY = "An example kernel recipe that uses the linux-yocto and oe-core" # To use linux-yocto-custom in your layer, copy this recipe (optionally # rename it as well) and modify it appropriately for your machine. i.e.: # -# COMPATIBLE_MACHINE_yourmachine = "yourmachine" +# COMPATIBLE_MACHINE:yourmachine = "yourmachine" # # You must also provide a Linux kernel configuration. The most direct # method is to copy your .config to files/defconfig in your layer, @@ -64,7 +64,7 @@ LINUX_VERSION_EXTENSION:append = "-custom" # tag: v4.2 64291f7db5bd8150a74ad2036f1037e6a0428df2 SRCREV_machine="64291f7db5bd8150a74ad2036f1037e6a0428df2" -PV = "${LINUX_VERSION}+git${SRCPV}" +PV = "${LINUX_VERSION}+git" # Override COMPATIBLE_MACHINE to include your machine in a copy of this recipe # file. Leaving it empty here ensures an early explicit build failure. diff --git a/meta-skeleton/recipes-skeleton/hello-autotools/hello_2.10.bb b/meta-skeleton/recipes-skeleton/hello-autotools/hello_2.10.bb index aa2beb9a9b..a64088fbaa 100644 --- a/meta-skeleton/recipes-skeleton/hello-autotools/hello_2.10.bb +++ b/meta-skeleton/recipes-skeleton/hello-autotools/hello_2.10.bb @@ -1,6 +1,6 @@ DESCRIPTION = "GNU Helloworld application" SECTION = "examples" -LICENSE = "GPLv3" +LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" SRC_URI = "${GNU_MIRROR}/hello/hello-${PV}.tar.gz" diff --git a/meta-skeleton/recipes-skeleton/libxpm/libxpm_3.5.6.bb b/meta-skeleton/recipes-skeleton/libxpm/libxpm_3.5.6.bb index a1ad2e87d4..1fcbbdd65e 100644 --- a/meta-skeleton/recipes-skeleton/libxpm/libxpm_3.5.6.bb +++ b/meta-skeleton/recipes-skeleton/libxpm/libxpm_3.5.6.bb @@ -4,7 +4,6 @@ DESCRIPTION = "X11 Pixmap library" LICENSE = "X-BSD" LIC_FILES_CHKSUM = "file://COPYING;md5=3e07763d16963c3af12db271a31abaa5" DEPENDS += "libxext" -PR = "r2" PE = "1" XORG_PN = "libXpm" diff --git a/meta-skeleton/recipes-skeleton/service/service_0.1.bb b/meta-skeleton/recipes-skeleton/service/service_0.1.bb index 2c048aa050..912f6b0f61 100644 --- a/meta-skeleton/recipes-skeleton/service/service_0.1.bb +++ b/meta-skeleton/recipes-skeleton/service/service_0.1.bb @@ -1,7 +1,7 @@ SUMMARY = "The canonical example of init scripts" SECTION = "base" DESCRIPTION = "This recipe is a canonical example of init scripts" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://${WORKDIR}/COPYRIGHT;md5=349c872e0066155e1818b786938876a4" SRC_URI = "file://skeleton \ @@ -9,6 +9,8 @@ SRC_URI = "file://skeleton \ file://COPYRIGHT \ " +S = "${WORKDIR}" + do_compile () { ${CC} ${CFLAGS} ${LDFLAGS} ${WORKDIR}/skeleton_test.c -o ${WORKDIR}/skeleton-test } diff --git a/meta-skeleton/recipes-skeleton/useradd/useradd-example.bb b/meta-skeleton/recipes-skeleton/useradd/useradd-example.bb index 3f4c42d714..8437a5a774 100644 --- a/meta-skeleton/recipes-skeleton/useradd/useradd-example.bb +++ b/meta-skeleton/recipes-skeleton/useradd/useradd-example.bb @@ -1,7 +1,6 @@ SUMMARY = "Example recipe for using inherit useradd" DESCRIPTION = "This recipe serves as an example for using features from useradd.bbclass" SECTION = "examples" -PR = "r1" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" @@ -32,9 +31,9 @@ USERADD_PACKAGES = "${PN} ${PN}-user3" # user1 and user2: USERADD_PARAM:${PN} = "-u 1200 -d /home/user1 -r -s /bin/bash user1; -u 1201 -d /home/user2 -r -s /bin/bash user2" -# user3 will be managed in the useradd-example-user3 pacakge: -# As an example, we use the -P option to set clear text password for user3 -USERADD_PARAM:${PN}-user3 = "-u 1202 -d /home/user3 -r -s /bin/bash -P 'user3' user3" +# user3 will be managed in the useradd-example-user3 package: +# As an example, we use the -p option to set password ('user3') for user3 +USERADD_PARAM:${PN}-user3 = "-u 1202 -d /home/user3 -r -s /bin/bash -p '\$6\$XAWr.8nc\$bUE4pYYaVb8n6BbnBitU0zeJMtfhTpFpiOBLL9zRl4e4YQo88UU4r/1kjRzmTimCy.BvDh4xoFwVqcO.pihLa1' user3" # GROUPADD_PARAM works the same way, which you set to the options # you'd normally pass to the groupadd command. This will create |