diff options
Diffstat (limited to 'meta-skeleton')
6 files changed, 12 insertions, 11 deletions
diff --git a/meta-skeleton/conf/layer.conf b/meta-skeleton/conf/layer.conf index 963d2d5ce9..43ef90a9f0 100644 --- a/meta-skeleton/conf/layer.conf +++ b/meta-skeleton/conf/layer.conf | |||
@@ -14,4 +14,4 @@ LAYERVERSION_skeleton = "1" | |||
14 | 14 | ||
15 | LAYERDEPENDS_skeleton = "core" | 15 | LAYERDEPENDS_skeleton = "core" |
16 | 16 | ||
17 | LAYERSERIES_COMPAT_skeleton = "styhead" | 17 | LAYERSERIES_COMPAT_skeleton = "whinlatter" |
diff --git a/meta-skeleton/conf/multilib-example.conf b/meta-skeleton/conf/multilib-example.conf index 07fd7b6ce4..cddbfc17ae 100644 --- a/meta-skeleton/conf/multilib-example.conf +++ b/meta-skeleton/conf/multilib-example.conf | |||
@@ -3,11 +3,12 @@ | |||
3 | # or specific in an configuration file like this, then require it. | 3 | # or specific in an configuration file like this, then require it. |
4 | # | 4 | # |
5 | # This configuration specifies an x86 64 bit machine as the main machine | 5 | # This configuration specifies an x86 64 bit machine as the main machine |
6 | # type and then adds a multilib in the "lib32" directory where those | 6 | # type and then adds a multilib in the explicitly overwritten "lib32" directory |
7 | # libraries are compiled with the "x86" tune. | 7 | # where those libraries are compiled with the "x86" tune. |
8 | # | 8 | # |
9 | 9 | ||
10 | MACHINE = "qemux86-64" | 10 | MACHINE = "qemux86-64" |
11 | require conf/multilib.conf | 11 | require conf/multilib.conf |
12 | MULTILIBS = "multilib:lib32" | 12 | MULTILIBS = "multilib:lib32" |
13 | DEFAULTTUNE:virtclass-multilib-lib32 = "x86" | 13 | DEFAULTTUNE:virtclass-multilib-lib32 = "x86" |
14 | BASELIB:virtclass-multilib-lib32 = "lib32" | ||
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 a2fb212a68..e5f0ca1023 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 | |||
@@ -10,7 +10,7 @@ SRC_URI = "file://Makefile \ | |||
10 | file://COPYING \ | 10 | file://COPYING \ |
11 | " | 11 | " |
12 | 12 | ||
13 | S = "${WORKDIR}" | 13 | S = "${UNPACKDIR}" |
14 | 14 | ||
15 | # The inherit of module.bbclass will automatically name module packages with | 15 | # The inherit of module.bbclass will automatically name module packages with |
16 | # "kernel-module-" prefix as required by the oe-core build environment. | 16 | # "kernel-module-" prefix as required by the oe-core build environment. |
diff --git a/meta-skeleton/recipes-skeleton/hello-single/hello_1.0.bb b/meta-skeleton/recipes-skeleton/hello-single/hello_1.0.bb index 90d3aefd86..cb07b13974 100644 --- a/meta-skeleton/recipes-skeleton/hello-single/hello_1.0.bb +++ b/meta-skeleton/recipes-skeleton/hello-single/hello_1.0.bb | |||
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda | |||
5 | 5 | ||
6 | SRC_URI = "file://helloworld.c" | 6 | SRC_URI = "file://helloworld.c" |
7 | 7 | ||
8 | S = "${WORKDIR}" | 8 | S = "${UNPACKDIR}" |
9 | 9 | ||
10 | do_compile() { | 10 | do_compile() { |
11 | ${CC} ${LDFLAGS} helloworld.c -o helloworld | 11 | ${CC} ${LDFLAGS} helloworld.c -o helloworld |
diff --git a/meta-skeleton/recipes-skeleton/service/service_0.1.bb b/meta-skeleton/recipes-skeleton/service/service_0.1.bb index 912f6b0f61..f249579310 100644 --- a/meta-skeleton/recipes-skeleton/service/service_0.1.bb +++ b/meta-skeleton/recipes-skeleton/service/service_0.1.bb | |||
@@ -2,22 +2,22 @@ SUMMARY = "The canonical example of init scripts" | |||
2 | SECTION = "base" | 2 | SECTION = "base" |
3 | DESCRIPTION = "This recipe is a canonical example of init scripts" | 3 | DESCRIPTION = "This recipe is a canonical example of init scripts" |
4 | LICENSE = "GPL-2.0-only" | 4 | LICENSE = "GPL-2.0-only" |
5 | LIC_FILES_CHKSUM = "file://${WORKDIR}/COPYRIGHT;md5=349c872e0066155e1818b786938876a4" | 5 | LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=349c872e0066155e1818b786938876a4" |
6 | 6 | ||
7 | SRC_URI = "file://skeleton \ | 7 | SRC_URI = "file://skeleton \ |
8 | file://skeleton_test.c \ | 8 | file://skeleton_test.c \ |
9 | file://COPYRIGHT \ | 9 | file://COPYRIGHT \ |
10 | " | 10 | " |
11 | 11 | ||
12 | S = "${WORKDIR}" | 12 | S = "${UNPACKDIR}" |
13 | 13 | ||
14 | do_compile () { | 14 | do_compile () { |
15 | ${CC} ${CFLAGS} ${LDFLAGS} ${WORKDIR}/skeleton_test.c -o ${WORKDIR}/skeleton-test | 15 | ${CC} ${CFLAGS} ${LDFLAGS} ${S}/skeleton_test.c -o ${B}/skeleton-test |
16 | } | 16 | } |
17 | 17 | ||
18 | do_install () { | 18 | do_install () { |
19 | install -d ${D}${sysconfdir}/init.d | 19 | install -d ${D}${sysconfdir}/init.d |
20 | cat ${WORKDIR}/skeleton | \ | 20 | cat ${S}/skeleton | \ |
21 | sed -e 's,/etc,${sysconfdir},g' \ | 21 | sed -e 's,/etc,${sysconfdir},g' \ |
22 | -e 's,/usr/sbin,${sbindir},g' \ | 22 | -e 's,/usr/sbin,${sbindir},g' \ |
23 | -e 's,/var,${localstatedir},g' \ | 23 | -e 's,/var,${localstatedir},g' \ |
@@ -26,7 +26,7 @@ do_install () { | |||
26 | chmod a+x ${D}${sysconfdir}/init.d/skeleton | 26 | chmod a+x ${D}${sysconfdir}/init.d/skeleton |
27 | 27 | ||
28 | install -d ${D}${sbindir} | 28 | install -d ${D}${sbindir} |
29 | install -m 0755 ${WORKDIR}/skeleton-test ${D}${sbindir}/ | 29 | install -m 0755 ${S}/skeleton-test ${D}${sbindir}/ |
30 | } | 30 | } |
31 | 31 | ||
32 | RDEPENDS:${PN} = "initscripts" | 32 | RDEPENDS:${PN} = "initscripts" |
diff --git a/meta-skeleton/recipes-skeleton/useradd/useradd-example.bb b/meta-skeleton/recipes-skeleton/useradd/useradd-example.bb index 8437a5a774..5783d9e245 100644 --- a/meta-skeleton/recipes-skeleton/useradd/useradd-example.bb +++ b/meta-skeleton/recipes-skeleton/useradd/useradd-example.bb | |||
@@ -9,7 +9,7 @@ SRC_URI = "file://file1 \ | |||
9 | file://file3 \ | 9 | file://file3 \ |
10 | file://file4" | 10 | file://file4" |
11 | 11 | ||
12 | S = "${WORKDIR}" | 12 | S = "${UNPACKDIR}" |
13 | 13 | ||
14 | PACKAGES =+ "${PN}-user3" | 14 | PACKAGES =+ "${PN}-user3" |
15 | 15 | ||