diff options
Diffstat (limited to 'meta/recipes-core')
-rw-r--r-- | meta/recipes-core/base-passwd/base-passwd_3.5.29.bb | 29 | ||||
-rw-r--r-- | meta/recipes-core/glibc/glibc-initial.inc | 19 | ||||
-rw-r--r-- | meta/recipes-core/glibc/glibc.inc | 2 | ||||
-rw-r--r-- | meta/recipes-core/meta/build-sysroots.bb | 38 | ||||
-rw-r--r-- | meta/recipes-core/meta/meta-environment-extsdk.bb | 4 | ||||
-rw-r--r-- | meta/recipes-core/meta/meta-extsdk-toolchain.bb | 2 | ||||
-rw-r--r-- | meta/recipes-core/meta/meta-world-pkgdata.bb | 2 | ||||
-rw-r--r-- | meta/recipes-core/musl/musl.inc | 1 |
8 files changed, 52 insertions, 45 deletions
diff --git a/meta/recipes-core/base-passwd/base-passwd_3.5.29.bb b/meta/recipes-core/base-passwd/base-passwd_3.5.29.bb index 10457b2dec..e43bc0a007 100644 --- a/meta/recipes-core/base-passwd/base-passwd_3.5.29.bb +++ b/meta/recipes-core/base-passwd/base-passwd_3.5.29.bb | |||
@@ -23,8 +23,6 @@ UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/b/base-passwd/" | |||
23 | 23 | ||
24 | inherit autotools | 24 | inherit autotools |
25 | 25 | ||
26 | SSTATEPOSTINSTFUNCS += "base_passwd_sstate_postinst" | ||
27 | |||
28 | do_install () { | 26 | do_install () { |
29 | install -d -m 755 ${D}${sbindir} | 27 | install -d -m 755 ${D}${sbindir} |
30 | install -o root -g root -p -m 755 ${B}/update-passwd ${D}${sbindir}/ | 28 | install -o root -g root -p -m 755 ${B}/update-passwd ${D}${sbindir}/ |
@@ -45,23 +43,16 @@ do_install () { | |||
45 | install -p -m 644 ${S}/debian/copyright ${D}${docdir}/${BPN}/ | 43 | install -p -m 644 ${S}/debian/copyright ${D}${docdir}/${BPN}/ |
46 | } | 44 | } |
47 | 45 | ||
48 | base_passwd_sstate_postinst() { | 46 | SYSROOT_DIRS += "${sysconfdir}" |
49 | if [ "${BB_CURRENTTASK}" = "populate_sysroot" -o "${BB_CURRENTTASK}" = "populate_sysroot_setscene" ] | 47 | SYSROOT_PREPROCESS_FUNCS += "base_passwd_tweaksysroot" |
50 | then | 48 | |
51 | # Staging does not copy ${sysconfdir} files into the | 49 | base_passwd_tweaksysroot () { |
52 | # target sysroot, so we need to do so manually. We | 50 | # Install passwd.master and group.master to sysconfdir |
53 | # put these files in the target sysroot so they can | 51 | install -d -m 755 ${SYSROOT_DESTDIR}${sysconfdir} |
54 | # be used by recipes which use custom user/group | 52 | for i in passwd group; do |
55 | # permissions. | 53 | install -p -m 644 ${SYSROOT_DESTDIR}${datadir}/base-passwd/$i.master \ |
56 | # Install passwd.master and group.master to sysconfdir and mv | 54 | ${SYSROOT_DESTDIR}${sysconfdir}/$i |
57 | # them to make sure they are atomically install. | 55 | done |
58 | install -d -m 755 ${STAGING_DIR_TARGET}${sysconfdir} | ||
59 | for i in passwd group; do | ||
60 | install -p -m 644 ${STAGING_DIR_TARGET}${datadir}/base-passwd/$i.master \ | ||
61 | ${STAGING_DIR_TARGET}${sysconfdir}/ | ||
62 | mv ${STAGING_DIR_TARGET}${sysconfdir}/$i.master ${STAGING_DIR_TARGET}${sysconfdir}/$i | ||
63 | done | ||
64 | fi | ||
65 | } | 56 | } |
66 | 57 | ||
67 | python populate_packages_prepend() { | 58 | python populate_packages_prepend() { |
diff --git a/meta/recipes-core/glibc/glibc-initial.inc b/meta/recipes-core/glibc/glibc-initial.inc index 2e3bc8104a..7380bdbcac 100644 --- a/meta/recipes-core/glibc/glibc-initial.inc +++ b/meta/recipes-core/glibc/glibc-initial.inc | |||
@@ -6,7 +6,6 @@ PACKAGES_DYNAMIC = "" | |||
6 | 6 | ||
7 | STAGINGCC = "gcc-cross-initial-${TARGET_ARCH}" | 7 | STAGINGCC = "gcc-cross-initial-${TARGET_ARCH}" |
8 | STAGINGCC_class-nativesdk = "gcc-crosssdk-initial-${SDK_SYS}" | 8 | STAGINGCC_class-nativesdk = "gcc-crosssdk-initial-${SDK_SYS}" |
9 | TOOLCHAIN_OPTIONS = " --sysroot=${STAGING_DIR_TCBOOTSTRAP}" | ||
10 | 9 | ||
11 | do_configure () { | 10 | do_configure () { |
12 | (cd ${S} && gnu-configize) || die "failure in running gnu-configize" | 11 | (cd ${S} && gnu-configize) || die "failure in running gnu-configize" |
@@ -42,10 +41,6 @@ do_install () { | |||
42 | if [ -e ${B}/bits/stdio_lim.h ]; then | 41 | if [ -e ${B}/bits/stdio_lim.h ]; then |
43 | cp ${B}/bits/stdio_lim.h ${D}${includedir}/bits/ | 42 | cp ${B}/bits/stdio_lim.h ${D}${includedir}/bits/ |
44 | fi | 43 | fi |
45 | # add links to linux-libc-headers: final glibc build need this. | ||
46 | for t in linux asm asm-generic; do | ||
47 | ln -s ${STAGING_DIR_TARGET}${includedir}/$t ${D}${includedir}/ | ||
48 | done | ||
49 | } | 44 | } |
50 | 45 | ||
51 | do_install_locale() { | 46 | do_install_locale() { |
@@ -56,20 +51,6 @@ do_siteconfig () { | |||
56 | : | 51 | : |
57 | } | 52 | } |
58 | 53 | ||
59 | SSTATEPOSTINSTFUNCS += "glibcinitial_sstate_postinst" | ||
60 | glibcinitial_sstate_postinst() { | ||
61 | if [ "${BB_CURRENTTASK}" = "populate_sysroot" -o "${BB_CURRENTTASK}" = "populate_sysroot_setscene" ] | ||
62 | then | ||
63 | # Recreate the symlinks to ensure they point to the correct location | ||
64 | for t in linux asm asm-generic; do | ||
65 | rm -f ${STAGING_DIR_TCBOOTSTRAP}${includedir}/$t | ||
66 | ln -s ${STAGING_DIR_TARGET}${includedir}/$t ${STAGING_DIR_TCBOOTSTRAP}${includedir}/ | ||
67 | done | ||
68 | fi | ||
69 | } | ||
70 | |||
71 | do_populate_sysroot[sstate-outputdirs] = "${STAGING_DIR_TCBOOTSTRAP}/" | ||
72 | |||
73 | # We don't install any scripts so there is nothing to evacuate | 54 | # We don't install any scripts so there is nothing to evacuate |
74 | do_evacuate_scripts () { | 55 | do_evacuate_scripts () { |
75 | : | 56 | : |
diff --git a/meta/recipes-core/glibc/glibc.inc b/meta/recipes-core/glibc/glibc.inc index 823e60e771..21bbdc2ad0 100644 --- a/meta/recipes-core/glibc/glibc.inc +++ b/meta/recipes-core/glibc/glibc.inc | |||
@@ -6,8 +6,6 @@ STAGINGCC = "gcc-cross-initial-${TARGET_ARCH}" | |||
6 | STAGINGCC_class-nativesdk = "gcc-crosssdk-initial-${SDK_SYS}" | 6 | STAGINGCC_class-nativesdk = "gcc-crosssdk-initial-${SDK_SYS}" |
7 | PATH_prepend = "${STAGING_BINDIR_TOOLCHAIN}.${STAGINGCC}:" | 7 | PATH_prepend = "${STAGING_BINDIR_TOOLCHAIN}.${STAGINGCC}:" |
8 | 8 | ||
9 | TOOLCHAIN_OPTIONS = " --sysroot=${STAGING_DIR_TCBOOTSTRAP}" | ||
10 | |||
11 | python () { | 9 | python () { |
12 | opt_effective = "-O" | 10 | opt_effective = "-O" |
13 | for opt in d.getVar('SELECTED_OPTIMIZATION').split(): | 11 | for opt in d.getVar('SELECTED_OPTIMIZATION').split(): |
diff --git a/meta/recipes-core/meta/build-sysroots.bb b/meta/recipes-core/meta/build-sysroots.bb new file mode 100644 index 0000000000..7a712e2f38 --- /dev/null +++ b/meta/recipes-core/meta/build-sysroots.bb | |||
@@ -0,0 +1,38 @@ | |||
1 | INHIBIT_DEFAULT_DEPS = "1" | ||
2 | LICENSE = "MIT" | ||
3 | |||
4 | STANDALONE_SYSROOT = "${STAGING_DIR}/${MACHINE}" | ||
5 | STANDALONE_SYSROOT_NATIVE = "${STAGING_DIR}/${BUILD_ARCH}" | ||
6 | PACKAGE_ARCH = "${MACHINE_ARCH}" | ||
7 | EXCLUDE_FROM_WORLD = "1" | ||
8 | |||
9 | inherit nopackages | ||
10 | deltask fetch | ||
11 | deltask unpack | ||
12 | deltask patch | ||
13 | deltask prepare_recipe_sysroot | ||
14 | deltask populate_lic | ||
15 | deltask configure | ||
16 | deltask compile | ||
17 | deltask install | ||
18 | deltask populate_sysroot | ||
19 | |||
20 | python do_build_native_sysroot () { | ||
21 | targetsysroot = d.getVar("STANDALONE_SYSROOT") | ||
22 | nativesysroot = d.getVar("STANDALONE_SYSROOT_NATIVE") | ||
23 | staging_populate_sysroot_dir(targetsysroot, nativesysroot, True, d) | ||
24 | } | ||
25 | do_build_native_sysroot[cleandirs] = "${STANDALONE_SYSROOT_NATIVE}" | ||
26 | do_build_native_sysroot[nostamp] = "1" | ||
27 | addtask do_build_native_sysroot before do_build | ||
28 | |||
29 | python do_build_target_sysroot () { | ||
30 | targetsysroot = d.getVar("STANDALONE_SYSROOT") | ||
31 | nativesysroot = d.getVar("STANDALONE_SYSROOT_NATIVE") | ||
32 | staging_populate_sysroot_dir(targetsysroot, nativesysroot, False, d) | ||
33 | } | ||
34 | do_build_target_sysroot[cleandirs] = "${STANDALONE_SYSROOT}" | ||
35 | do_build_target_sysroot[nostamp] = "1" | ||
36 | addtask do_build_target_sysroot before do_build | ||
37 | |||
38 | do_clean[cleandirs] += "${STANDALONE_SYSROOT} ${STANDALONE_SYSROOT_NATIVE}" | ||
diff --git a/meta/recipes-core/meta/meta-environment-extsdk.bb b/meta/recipes-core/meta/meta-environment-extsdk.bb index 757afc154f..2076b56f25 100644 --- a/meta/recipes-core/meta/meta-environment-extsdk.bb +++ b/meta/recipes-core/meta/meta-environment-extsdk.bb | |||
@@ -5,8 +5,8 @@ require meta-environment.bb | |||
5 | PN = "meta-environment-extsdk-${MACHINE}" | 5 | PN = "meta-environment-extsdk-${MACHINE}" |
6 | 6 | ||
7 | create_sdk_files_append() { | 7 | create_sdk_files_append() { |
8 | local sysroot=${SDKPATH}/tmp/${@os.path.relpath(d.getVar('STAGING_DIR_TARGET'), d.getVar('TMPDIR'))} | 8 | local sysroot=${SDKPATH}/tmp/${@os.path.relpath(d.getVar('STAGING_DIR'), d.getVar('TMPDIR'))}/${MACHINE} |
9 | local sdkpathnative=${SDKPATH}/tmp/${@os.path.relpath(d.getVar('STAGING_DIR_NATIVE'), d.getVar('TMPDIR'))} | 9 | local sdkpathnative=${SDKPATH}/tmp/${@os.path.relpath(d.getVar('STAGING_DIR'), d.getVar('TMPDIR'))}/${BUILD_ARCH} |
10 | 10 | ||
11 | toolchain_create_sdk_env_script '' '' $sysroot '' ${bindir_native} ${prefix_native} $sdkpathnative | 11 | toolchain_create_sdk_env_script '' '' $sysroot '' ${bindir_native} ${prefix_native} $sdkpathnative |
12 | } | 12 | } |
diff --git a/meta/recipes-core/meta/meta-extsdk-toolchain.bb b/meta/recipes-core/meta/meta-extsdk-toolchain.bb index fc6d6de99a..0b8fcf08dc 100644 --- a/meta/recipes-core/meta/meta-extsdk-toolchain.bb +++ b/meta/recipes-core/meta/meta-extsdk-toolchain.bb | |||
@@ -15,7 +15,7 @@ LOCKED_SIGS_INDIR = "${D}/locked-sigs" | |||
15 | addtask do_locked_sigs after do_populate_sysroot | 15 | addtask do_locked_sigs after do_populate_sysroot |
16 | SSTATETASKS += "do_locked_sigs" | 16 | SSTATETASKS += "do_locked_sigs" |
17 | do_locked_sigs[sstate-inputdirs] = "${LOCKED_SIGS_INDIR}" | 17 | do_locked_sigs[sstate-inputdirs] = "${LOCKED_SIGS_INDIR}" |
18 | do_locked_sigs[sstate-outputdirs] = "${STAGING_DIR_HOST}/locked-sigs" | 18 | do_locked_sigs[sstate-outputdirs] = "${STAGING_DIR}/${PACKAGE_ARCH}/${PN}/locked-sigs" |
19 | 19 | ||
20 | python do_locked_sigs() { | 20 | python do_locked_sigs() { |
21 | import oe.copy_buildsystem | 21 | import oe.copy_buildsystem |
diff --git a/meta/recipes-core/meta/meta-world-pkgdata.bb b/meta/recipes-core/meta/meta-world-pkgdata.bb index 0ce378ea2b..617f96a33e 100644 --- a/meta/recipes-core/meta/meta-world-pkgdata.bb +++ b/meta/recipes-core/meta/meta-world-pkgdata.bb | |||
@@ -32,7 +32,7 @@ do_configure[noexec] = "1" | |||
32 | do_compile[noexec] = "1" | 32 | do_compile[noexec] = "1" |
33 | do_install[noexec] = "1" | 33 | do_install[noexec] = "1" |
34 | 34 | ||
35 | do_configure[deptask] = "" | 35 | do_prepare_recipe_sysroot[deptask] = "" |
36 | 36 | ||
37 | WORLD_PKGDATA_EXCLUDE ?= "" | 37 | WORLD_PKGDATA_EXCLUDE ?= "" |
38 | 38 | ||
diff --git a/meta/recipes-core/musl/musl.inc b/meta/recipes-core/musl/musl.inc index 7ed931c6da..56c9d7fe17 100644 --- a/meta/recipes-core/musl/musl.inc +++ b/meta/recipes-core/musl/musl.inc | |||
@@ -12,7 +12,6 @@ SECTION = "libs" | |||
12 | LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=7928b7ad32ceda04932478e330e52f7f" | 12 | LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=7928b7ad32ceda04932478e330e52f7f" |
13 | 13 | ||
14 | PATH_prepend = "${STAGING_BINDIR_TOOLCHAIN}.${STAGINGCC}:" | 14 | PATH_prepend = "${STAGING_BINDIR_TOOLCHAIN}.${STAGINGCC}:" |
15 | TOOLCHAIN_OPTIONS = " --sysroot=${STAGING_DIR_TCBOOTSTRAP}" | ||
16 | 15 | ||
17 | INHIBIT_DEFAULT_DEPS = "1" | 16 | INHIBIT_DEFAULT_DEPS = "1" |
18 | 17 | ||