diff options
Diffstat (limited to 'meta-skeleton')
5 files changed, 44 insertions, 37 deletions
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 c40b393fa4..b140b0ac8e 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 @@ -4,9 +4,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e" inherit module -PR = "r0" -PV = "0.1" - SRC_URI = "file://Makefile \ file://hello.c \ file://COPYING \ diff --git a/meta-skeleton/recipes-kernel/linux/linux-yocto-custom.bb b/meta-skeleton/recipes-kernel/linux/linux-yocto-custom.bb index 42162f3c4a..6194d4f8da 100644 --- a/meta-skeleton/recipes-kernel/linux/linux-yocto-custom.bb +++ b/meta-skeleton/recipes-kernel/linux/linux-yocto-custom.bb @@ -4,17 +4,15 @@ # kernel classes to apply a subset of yocto kernel management to git # managed kernel repositories. # -# To use linux-yocto-custom in your layer, create a -# linux-yocto-custom.bbappend file containing at least the following -# lines: +# 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.: # -# FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" # 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, -# in the same directory as the bbappend and add file://defconfig to -# your SRC_URI. +# in the same directory as the copy (and rename) of this recipe and +# add file://defconfig to your SRC_URI. # # To use the yocto kernel tooling to generate a BSP configuration # using modular configuration fragments, see the yocto-bsp and @@ -32,33 +30,42 @@ # patches: patches can be merged into to the source git tree itself, # added via the SRC_URI, or controlled via a BSP # configuration. +# +# defconfig: When a defconfig is provided, the linux-yocto configuration +# uses the filename as a trigger to use a 'allnoconfig' baseline +# before merging the defconfig into the build. +# +# If the defconfig file was created with make_savedefconfig, +# not all options are specified, and should be restored with their +# defaults, not set to 'n'. To properly expand a defconfig like +# this, specify: KCONFIG_MODE="--alldefconfig" in the kernel +# recipe. # # example configuration addition: # SRC_URI += "file://smp.cfg" -# example patch addition (for kernel v3.4 only): -# SRC_URI += "file://0001-linux-version-tweak.patch -# example feature addition (for kernel v3.4 only): +# example patch addition (for kernel v4.x only): +# SRC_URI += "file://0001-linux-version-tweak.patch" +# example feature addition (for kernel v4.x only): # SRC_URI += "file://feature.scc" # inherit kernel require recipes-kernel/linux/linux-yocto.inc -# Override SRC_URI in a bbappend file to point at a different source +# Override SRC_URI in a copy of this recipe to point at a different source # tree if you do not want to build from Linus' tree. -SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git;protocol=git;nocheckout=1" +SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git;protocol=git;nocheckout=1;name=machine" -LINUX_VERSION ?= "3.4" -LINUX_VERSION_EXTENSION ?= "-custom" +LINUX_VERSION ?= "4.2" +LINUX_VERSION_EXTENSION_append = "-custom" -# Override SRCREV to point to a different commit in a bbappend file to +# Modify SRCREV to a different commit hash in a copy of this recipe to # build a different release of the Linux kernel. -# tag: v3.4 76e10d158efb6d4516018846f60c2ab5501900bc -SRCREV_machine="76e10d158efb6d4516018846f60c2ab5501900bc" +# tag: v4.2 64291f7db5bd8150a74ad2036f1037e6a0428df2 +SRCREV_machine="64291f7db5bd8150a74ad2036f1037e6a0428df2" -PR = "r1" PV = "${LINUX_VERSION}+git${SRCPV}" -# Override COMPATIBLE_MACHINE to include your machine in a bbappend +# Override COMPATIBLE_MACHINE to include your machine in a copy of this recipe # file. Leaving it empty here ensures an early explicit build failure. COMPATIBLE_MACHINE = "(^$)" diff --git a/meta-skeleton/recipes-kernel/linux/linux-yocto-custom/0001-linux-version-tweak.patch b/meta-skeleton/recipes-kernel/linux/linux-yocto-custom/0001-linux-version-tweak.patch index c9562da10d..1c88315cdc 100644 --- a/meta-skeleton/recipes-kernel/linux/linux-yocto-custom/0001-linux-version-tweak.patch +++ b/meta-skeleton/recipes-kernel/linux/linux-yocto-custom/0001-linux-version-tweak.patch @@ -1,26 +1,29 @@ -From 5a55943a6bbb10a79994a0b18071b2427dffb15f Mon Sep 17 00:00:00 2001 +From fb2c401374d4efe89e8da795e21d96fac038639d Mon Sep 17 00:00:00 2001 From: Bruce Ashfield <bruce.ashfield@windriver.com> Date: Mon, 11 Jun 2012 15:31:42 -0400 Subject: [PATCH] linux: version tweak +Upstream-Status: Inappropriate [example code] + Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> +Signed-off-by: Saul Wold <sgw@linux.intel.com> --- - Makefile | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile -index a687963..f5b1ac3 100644 +index c361593..099e8ff 100644 --- a/Makefile +++ b/Makefile -@@ -2,7 +2,7 @@ VERSION = 3 - PATCHLEVEL = 4 +@@ -2,7 +2,7 @@ VERSION = 4 + PATCHLEVEL = 2 SUBLEVEL = 0 EXTRAVERSION = --NAME = Saber-toothed Squirrel -+NAME = Saber-toothed Squirrel-custom +-NAME = Hurr durr I'ma sheep ++NAME = Hurr durr I'ma customized sheep # *DOCUMENTATION* # To see a list of typical targets execute "make help" -- -1.7.5.4 +2.1.4 diff --git a/meta-skeleton/recipes-skeleton/service/service_0.1.bb b/meta-skeleton/recipes-skeleton/service/service_0.1.bb index a3ad6ccb2f..6416618dcb 100644 --- a/meta-skeleton/recipes-skeleton/service/service_0.1.bb +++ b/meta-skeleton/recipes-skeleton/service/service_0.1.bb @@ -2,18 +2,14 @@ SUMMARY = "The canonical example of init scripts" SECTION = "base" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://${WORKDIR}/COPYRIGHT;md5=349c872e0066155e1818b786938876a4" -RDEPENDS_${PN} = "initscripts" -PR = "r0" SRC_URI = "file://skeleton \ file://skeleton_test.c \ file://COPYRIGHT \ " -CONFFILES_${PN} += "${sysconfdir}/init.d/skeleton" - do_compile () { - ${CC} ${WORKDIR}/skeleton_test.c -o ${WORKDIR}/skeleton-test + ${CC} ${CFLAGS} ${LDFLAGS} ${WORKDIR}/skeleton_test.c -o ${WORKDIR}/skeleton-test } do_install () { @@ -30,3 +26,6 @@ do_install () { install -m 0755 ${WORKDIR}/skeleton-test ${D}${sbindir}/ } +RDEPENDS_${PN} = "initscripts" + +CONFFILES_${PN} += "${sysconfdir}/init.d/skeleton" diff --git a/meta-skeleton/recipes-skeleton/useradd/useradd-example.bb b/meta-skeleton/recipes-skeleton/useradd/useradd-example.bb index d3c02d5d61..7c5b9d0503 100644 --- a/meta-skeleton/recipes-skeleton/useradd/useradd-example.bb +++ b/meta-skeleton/recipes-skeleton/useradd/useradd-example.bb @@ -3,8 +3,7 @@ DESCRIPTION = "This recipe serves as an example for using features from useradd. SECTION = "examples" PR = "r1" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690 \ - file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" SRC_URI = "file://file1 \ file://file2 \ @@ -15,6 +14,8 @@ S = "${WORKDIR}" PACKAGES =+ "${PN}-user3" +EXCLUDE_FROM_WORLD = "1" + inherit useradd # You must set USERADD_PACKAGES when you inherit useradd. This |