From 5126947f47bd65ec97ddfc5373b2e07c173dd2b3 Mon Sep 17 00:00:00 2001 From: JunsuChoi Date: Thu, 13 Jun 2024 15:10:55 +0900 Subject: [PATCH 1/5] [Tizen] Update default api-version of generate_sysroot script to 6.0 --- ci/tizen/generate_sysroot.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/tizen/generate_sysroot.py b/ci/tizen/generate_sysroot.py index c40bc6a449eb7..0b83fee1bf4bc 100755 --- a/ci/tizen/generate_sysroot.py +++ b/ci/tizen/generate_sysroot.py @@ -122,9 +122,9 @@ def main(): parser.add_argument( '--api-version', metavar='VER', - default=5.5, + default=6.0, type=float, - help='Target API version (defaults to 5.5)' + help='Target API version (defaults to 6.0)' ) args = parser.parse_args() From 10da51e2c48547929c82a0bff1c9db18640aa00c Mon Sep 17 00:00:00 2001 From: JunsuChoi Date: Thu, 13 Jun 2024 16:24:50 +0900 Subject: [PATCH 2/5] Add libstdc++ package to sysroot --- ci/tizen/generate_sysroot.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ci/tizen/generate_sysroot.py b/ci/tizen/generate_sysroot.py index 0b83fee1bf4bc..66aea7987e9b3 100755 --- a/ci/tizen/generate_sysroot.py +++ b/ci/tizen/generate_sysroot.py @@ -18,6 +18,8 @@ 'glibc', 'glibc-devel', 'libgcc', + 'libstdc++', + 'libstdc++-devel', 'linux-glibc-devel', 'zlib-devel', ] From 525a58b21d29b8ae28584164108999ce498dab33 Mon Sep 17 00:00:00 2001 From: JunsuChoi Date: Thu, 13 Jun 2024 16:46:20 +0900 Subject: [PATCH 3/5] Overwritten when copying libgcc* objects in generate_sysroot script --- ci/tizen/generate_sysroot.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/tizen/generate_sysroot.py b/ci/tizen/generate_sysroot.py index 66aea7987e9b3..4adb79470b502 100755 --- a/ci/tizen/generate_sysroot.py +++ b/ci/tizen/generate_sysroot.py @@ -100,7 +100,7 @@ def generate_sysroot(sysroot: Path, api_version: float, arch: str, quiet=False): libpath = sysroot / 'usr' / 'lib64' else: libpath = sysroot / 'usr' / 'lib' - subprocess.run('cp gcc/*/*/*.o gcc/*/*/*.a .', shell=True, cwd=libpath, check=True) + subprocess.run('cp -f gcc/*/*/*.o gcc/*/*/*.a .', shell=True, cwd=libpath, check=True) # Apply a patch if applicable. patch = Path(__file__).parent / '{}.patch'.format(arch) From dc381c6e5080b7442cada871230baad6e61fc24e Mon Sep 17 00:00:00 2001 From: JunsuChoi Date: Thu, 13 Jun 2024 17:19:24 +0900 Subject: [PATCH 4/5] Revert "Overwritten when copying libgcc* objects in generate_sysroot script" This reverts commit 525a58b21d29b8ae28584164108999ce498dab33. --- ci/tizen/generate_sysroot.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/tizen/generate_sysroot.py b/ci/tizen/generate_sysroot.py index 4adb79470b502..66aea7987e9b3 100755 --- a/ci/tizen/generate_sysroot.py +++ b/ci/tizen/generate_sysroot.py @@ -100,7 +100,7 @@ def generate_sysroot(sysroot: Path, api_version: float, arch: str, quiet=False): libpath = sysroot / 'usr' / 'lib64' else: libpath = sysroot / 'usr' / 'lib' - subprocess.run('cp -f gcc/*/*/*.o gcc/*/*/*.a .', shell=True, cwd=libpath, check=True) + subprocess.run('cp gcc/*/*/*.o gcc/*/*/*.a .', shell=True, cwd=libpath, check=True) # Apply a patch if applicable. patch = Path(__file__).parent / '{}.patch'.format(arch) From 4406ae9249d14c3d73b29b3d0c819a28ccee97c1 Mon Sep 17 00:00:00 2001 From: JunsuChoi Date: Wed, 19 Jun 2024 18:20:16 +0900 Subject: [PATCH 5/5] Remove libstdc++-devel package --- ci/tizen/generate_sysroot.py | 1 - 1 file changed, 1 deletion(-) diff --git a/ci/tizen/generate_sysroot.py b/ci/tizen/generate_sysroot.py index 66aea7987e9b3..c4bdc51f347cf 100755 --- a/ci/tizen/generate_sysroot.py +++ b/ci/tizen/generate_sysroot.py @@ -19,7 +19,6 @@ 'glibc-devel', 'libgcc', 'libstdc++', - 'libstdc++-devel', 'linux-glibc-devel', 'zlib-devel', ]