From b465038b2895715514bddc866c97b9b09ebf7740 Mon Sep 17 00:00:00 2001 From: adnan-ali1 Date: Wed, 3 Jun 2015 20:33:02 +0500 Subject: [PATCH 1/4] Architecture link in ADE Target Sysroot This link is required by linker to link libraries and crt* files. The 'rm -f' command is changed to 'rm -rf' because in cedar release external- toolchain.bbclass copies all the stuff required by PACKAGES to image folder (in do_install stage). In doing so it copies the architecture folder (as it is required by FILES_glibc-multilib-link ) from sorcery folder to image folder in work directory. Afterwords when we try to remove the directory with 'rm -f' it prompts an error as directories cannot be deleted with this command. Signed-off-by: adnan-ali1 --- recipes-external/glibc/core-image-base.bbappend | 1 + recipes-external/glibc/core-image-sato.bbappend | 1 + recipes-external/glibc/glibc-external.bb | 5 +++++ recipes-external/glibc/glibc-sysroot-setup.inc | 2 +- 4 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 recipes-external/glibc/core-image-base.bbappend create mode 100644 recipes-external/glibc/core-image-sato.bbappend diff --git a/recipes-external/glibc/core-image-base.bbappend b/recipes-external/glibc/core-image-base.bbappend new file mode 100644 index 0000000..32904e3 --- /dev/null +++ b/recipes-external/glibc/core-image-base.bbappend @@ -0,0 +1 @@ +TOOLCHAIN_HOST_TASK += "${@bb.utils.contains('BBFILE_COLLECTIONS', 'qt5-mel', 'glibc-multilib-link', '', d)}" diff --git a/recipes-external/glibc/core-image-sato.bbappend b/recipes-external/glibc/core-image-sato.bbappend new file mode 100644 index 0000000..32904e3 --- /dev/null +++ b/recipes-external/glibc/core-image-sato.bbappend @@ -0,0 +1 @@ +TOOLCHAIN_HOST_TASK += "${@bb.utils.contains('BBFILE_COLLECTIONS', 'qt5-mel', 'glibc-multilib-link', '', d)}" diff --git a/recipes-external/glibc/glibc-external.bb b/recipes-external/glibc/glibc-external.bb index 4c76bc9..1235339 100644 --- a/recipes-external/glibc/glibc-external.bb +++ b/recipes-external/glibc/glibc-external.bb @@ -68,6 +68,7 @@ glibc_external_do_install_extra () { "This may mean that your external toolchain uses a different" \ "multi-lib setup than your machine configuration" fi + create_multilib_link ${D} } EXTERNAL_EXTRA_FILES += "\ @@ -98,6 +99,10 @@ python () { } # Default pattern is too greedy + +PACKAGES += "glibc-multilib-link" +FILES_glibc-multilib-link += "${@sysroot_multilib_suffix(d)}" + FILES_${PN}-utils = "\ ${bindir}/gencat \ ${bindir}/getconf \ diff --git a/recipes-external/glibc/glibc-sysroot-setup.inc b/recipes-external/glibc/glibc-sysroot-setup.inc index df02b73..d5c95c1 100644 --- a/recipes-external/glibc/glibc-sysroot-setup.inc +++ b/recipes-external/glibc/glibc-sysroot-setup.inc @@ -10,7 +10,7 @@ create_multilib_link () { dest="$1" multilib_suffix="${@sysroot_multilib_suffix(d)}" if [ "$multilib_suffix" != "." ]; then - rm -f $dest/$multilib_suffix + rm -rf $dest/$multilib_suffix ln -s . $dest/$multilib_suffix fi } From b117d46a477fee163ede9ac15d18ea2005949c07 Mon Sep 17 00:00:00 2001 From: adnan-ali1 Date: Wed, 3 Jun 2015 20:59:19 +0500 Subject: [PATCH 2/4] fix: removed glibc-multilib-link dependency on qt5-mel glibc-multilib-link should not depend on qt5-mel layer included. Related Jira Issue: http://jira.alm.mentorg.com:8080/browse/SB-5093 Signed-off-by: adnan-ali1 --- recipes-external/glibc/core-image-base.bbappend | 2 +- recipes-external/glibc/core-image-sato.bbappend | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-external/glibc/core-image-base.bbappend b/recipes-external/glibc/core-image-base.bbappend index 32904e3..b7d8649 100644 --- a/recipes-external/glibc/core-image-base.bbappend +++ b/recipes-external/glibc/core-image-base.bbappend @@ -1 +1 @@ -TOOLCHAIN_HOST_TASK += "${@bb.utils.contains('BBFILE_COLLECTIONS', 'qt5-mel', 'glibc-multilib-link', '', d)}" +TOOLCHAIN_HOST_TASK += "glibc-multilib-link" diff --git a/recipes-external/glibc/core-image-sato.bbappend b/recipes-external/glibc/core-image-sato.bbappend index 32904e3..b7d8649 100644 --- a/recipes-external/glibc/core-image-sato.bbappend +++ b/recipes-external/glibc/core-image-sato.bbappend @@ -1 +1 @@ -TOOLCHAIN_HOST_TASK += "${@bb.utils.contains('BBFILE_COLLECTIONS', 'qt5-mel', 'glibc-multilib-link', '', d)}" +TOOLCHAIN_HOST_TASK += "glibc-multilib-link" From a1bece37c943c2de0e8de693960e662844834fc9 Mon Sep 17 00:00:00 2001 From: adnan-ali1 Date: Thu, 4 Jun 2015 13:49:22 +0500 Subject: [PATCH 3/4] adds the multilib link in colsole-image the glibc-multilib-link is already addded in core-image-sato and core- image-base. Jira Issue: http://jira.alm.mentorg.com:8080/browse/SB-5093 Signed-off-by: adnan-ali1 --- recipes-external/glibc/console-image.bbappend | 1 + 1 file changed, 1 insertion(+) create mode 100644 recipes-external/glibc/console-image.bbappend diff --git a/recipes-external/glibc/console-image.bbappend b/recipes-external/glibc/console-image.bbappend new file mode 100644 index 0000000..b7d8649 --- /dev/null +++ b/recipes-external/glibc/console-image.bbappend @@ -0,0 +1 @@ +TOOLCHAIN_HOST_TASK += "glibc-multilib-link" From a4682fab02e2d1eb97a5ba583ab28e4a37e4fe63 Mon Sep 17 00:00:00 2001 From: adnan-ali1 Date: Fri, 5 Jun 2015 15:44:54 +0500 Subject: [PATCH 4/4] glibc-multilib link added to glibc-external dev package instead of creating a new package which will only hold the multilib- link. It would be more appropriate to add the link in the glibc- external-dev package (as suggested by Chris). With this amendment there is no need for the bbappend files for core-image-sato core-image-base and console-image files. Signed-off-by: adnan-ali1 --- recipes-external/glibc/console-image.bbappend | 1 - recipes-external/glibc/core-image-base.bbappend | 1 - recipes-external/glibc/core-image-sato.bbappend | 1 - recipes-external/glibc/glibc-external.bb | 5 +++-- 4 files changed, 3 insertions(+), 5 deletions(-) delete mode 100644 recipes-external/glibc/console-image.bbappend delete mode 100644 recipes-external/glibc/core-image-base.bbappend delete mode 100644 recipes-external/glibc/core-image-sato.bbappend diff --git a/recipes-external/glibc/console-image.bbappend b/recipes-external/glibc/console-image.bbappend deleted file mode 100644 index b7d8649..0000000 --- a/recipes-external/glibc/console-image.bbappend +++ /dev/null @@ -1 +0,0 @@ -TOOLCHAIN_HOST_TASK += "glibc-multilib-link" diff --git a/recipes-external/glibc/core-image-base.bbappend b/recipes-external/glibc/core-image-base.bbappend deleted file mode 100644 index b7d8649..0000000 --- a/recipes-external/glibc/core-image-base.bbappend +++ /dev/null @@ -1 +0,0 @@ -TOOLCHAIN_HOST_TASK += "glibc-multilib-link" diff --git a/recipes-external/glibc/core-image-sato.bbappend b/recipes-external/glibc/core-image-sato.bbappend deleted file mode 100644 index b7d8649..0000000 --- a/recipes-external/glibc/core-image-sato.bbappend +++ /dev/null @@ -1 +0,0 @@ -TOOLCHAIN_HOST_TASK += "glibc-multilib-link" diff --git a/recipes-external/glibc/glibc-external.bb b/recipes-external/glibc/glibc-external.bb index 1235339..d311128 100644 --- a/recipes-external/glibc/glibc-external.bb +++ b/recipes-external/glibc/glibc-external.bb @@ -100,8 +100,6 @@ python () { # Default pattern is too greedy -PACKAGES += "glibc-multilib-link" -FILES_glibc-multilib-link += "${@sysroot_multilib_suffix(d)}" FILES_${PN}-utils = "\ ${bindir}/gencat \ @@ -148,6 +146,9 @@ FILES_${PN}-dev += "\ ${libdir}/libthread_db${SOLIBSDEV} \ ${libdir}/libpthread${SOLIBSDEV} \ " + +FILES_${PN}-dev += "${@sysroot_multilib_suffix(d)}" + libc_headers_file = "${@bb.utils.which('${FILESPATH}', 'libc.headers')}" FILES_${PN}-dev += "\ ${@' '.join('${includedir}/' + f.rstrip() for f in base_read_file('${libc_headers_file}').splitlines())} \