diff --git a/meta-openeuler/conf/distro/include/openeuler_hosttools.inc b/meta-openeuler/conf/distro/include/openeuler_hosttools.inc index c0e0fd8975ef31d4f4a8173fcd422e772892ba38..08cabaa7b391d60d2599a13911528fb435f04edc 100644 --- a/meta-openeuler/conf/distro/include/openeuler_hosttools.inc +++ b/meta-openeuler/conf/distro/include/openeuler_hosttools.inc @@ -95,7 +95,7 @@ ASSUME_PROVIDED += "gnu-config-native" ASSUME_PROVIDED += "gperf-native perl-native \ init-system-helpers \ - cross-localedef-native nativesdk-glibc-locale \ + nativesdk-glibc-locale \ \ gtk-doc-native \ " diff --git a/meta-openeuler/recipes-core/glibc/cross-localedef-native_%.bbappend b/meta-openeuler/recipes-core/glibc/cross-localedef-native_%.bbappend new file mode 100644 index 0000000000000000000000000000000000000000..fe60c68c879a4ad827c88ac609e3f1d69003b806 --- /dev/null +++ b/meta-openeuler/recipes-core/glibc/cross-localedef-native_%.bbappend @@ -0,0 +1,34 @@ +# main bbfile: yocto-poky/meta/recipes-core/glibc/cross-localedef-native_2.33.bb + +# version in openEuler +PV = "2.34" + +# don't donwload glibc and localedef by network +SRC_URI_remove = " \ + ${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \ + git://github.com/kraj/localedef;branch=master;name=localedef;destsuffix=git/localedef \ + file://0016-timezone-re-written-tzselect-as-posix-sh.patch \ +" + +# get extra config files from openeuler +FILESEXTRAPATHS_append := "${THISDIR}/files/:" +SRC_URI_prepend = " \ + file://glibc/glibc-2.34.tar.xz;name=tarball \ + file://glibc/glibc-c-utf8-locale.patch \ + file://glibc/localedef-Handle-symbolic-links-when-generating-loca.patch \ + file://localedef.tar.gz;name=localedef \ +" + +SRC_URI[tarball.md5sum] = "31998b53fb39cb946e96abc310af1c89" +SRC_URI[tarball.sha256sum] = "44d26a1fe20b8853a48f470ead01e4279e869ac149b195dda4e44a195d981ab2" +SRC_URI[localedef.md5sum] = "0d1879a0944284a0c0297977ad755fb8" +SRC_URI[localedef.sha256sum] = "f84d21e42cd476f81498041c68a47c357b7588550f20514fe20d7411d3972aa4" + +S = "${WORKDIR}/${BP}" + +do_copy_localedef() { + cp -r ${WORKDIR}/glibc-2.34/* ${S} + mv ${WORKDIR}/localedef ${S} +} + +addtask copy_localedef before do_patch after do_unpack diff --git a/meta-openeuler/recipes-core/glibc/files/localedef.tar.gz b/meta-openeuler/recipes-core/glibc/files/localedef.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..141da2f9a9498fd571c3d7b6a7b290b9274a52d3 Binary files /dev/null and b/meta-openeuler/recipes-core/glibc/files/localedef.tar.gz differ diff --git a/meta-openeuler/recipes-devtools/cdrkit/cdrkit_%.bbappend b/meta-openeuler/recipes-devtools/cdrkit/cdrkit_%.bbappend deleted file mode 100644 index 75c3610b4014e751334b1a14893c1313213f449c..0000000000000000000000000000000000000000 --- a/meta-openeuler/recipes-devtools/cdrkit/cdrkit_%.bbappend +++ /dev/null @@ -1,44 +0,0 @@ -# no bbfile in poky, refer to meta-oe bbfile: http://cgit.openembedded.org/meta-openembedded/tree/meta-oe/recipes-multimedia/cdrkit/cdrkit_1.1.11.bb?h=hardknott - -# files, patches can't be applied in openeuler or conflict with openeuler -# patches apply fail: 0001-genisoimage-Add-missing-extern-definition.patch -SRC_URI_remove = " \ - ${DEBIAN_MIRROR}/main/c/${BPN}/${BPN}_${PV}.orig.tar.gz \ - file://0001-genisoimage-Add-missing-extern-definition.patch \ -" - -# files, patches that come from openeuler -# patches apply fail: cdrkit-1.1.10-build-fix.patch -# CDDA cdparanoia is an audio CDs tool, thus don't apply cdrkit-1.1.11-paranoiacdda.patch -SRC_URI_prepend = " \ - file://${BP}.tar.gz;name=tarball \ - file://cdrkit-1.1.11-cmakewarn.patch \ - file://cdrkit-1.1.11-devname.patch \ - file://cdrkit-1.1.11-dvdman.patch \ - file://cdrkit-1.1.11-format.patch \ - file://cdrkit-1.1.11-gcc10.patch \ - file://cdrkit-1.1.11-handler.patch \ - file://cdrkit-1.1.11-manpagefix.patch \ - file://cdrkit-1.1.11-memset.patch \ - file://cdrkit-1.1.11-ppc64le_elfheader.patch \ - file://cdrkit-1.1.11-readsegfault.patch \ - file://cdrkit-1.1.11-rootstat.patch \ - file://cdrkit-1.1.11-sysmacros.patch \ - file://cdrkit-1.1.11-usalinst.patch \ - file://cdrkit-1.1.11-utf8.patch \ - file://cdrkit-1.1.11-werror_gcc5.patch \ - file://cdrkit-1.1.8-werror.patch \ - file://cdrkit-1.1.9-buffer_overflow.patch \ - file://cdrkit-1.1.9-efi-boot.patch \ - file://cdrkit-1.1.9-no_mp3.patch \ -" - -SRC_URI[tarball.md5sum] = "efe08e2f3ca478486037b053acd512e9" -SRC_URI[tarball.sha256sum] = "d1c030756ecc182defee9fe885638c1785d35a2c2a297b4604c0e0dcc78e47da" - -# fix problem "do_populate_sysroot: sstate found an absolute path symlink" -# refer to http://cgit.openembedded.org/meta-openembedded/tree/meta-oe/recipes-multimedia/cdrkit/cdrkit_1.1.11.bb?h=honister -do_install_append() { - rm -f ${D}${bindir}/mkisofs - ln -sf --relative ${D}${bindir}/genisoimage ${D}${bindir}/mkisofs -} diff --git a/meta-openeuler/recipes-devtools/cdrkit/cdrkit_1.1.11.bb b/meta-openeuler/recipes-devtools/cdrkit/cdrkit_1.1.11.bb deleted file mode 100644 index b9ee03425e70c6d2c2b67bcc0a41915f276ffb50..0000000000000000000000000000000000000000 --- a/meta-openeuler/recipes-devtools/cdrkit/cdrkit_1.1.11.bb +++ /dev/null @@ -1,59 +0,0 @@ -SUMMARY = "CD/DVD command line tools" -HOMEPAGE = "http://cdrkit.org/" - -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=b30d3b2750b668133fc17b401e1b98f8" - -# While writing download from cdrkit.org was broken so get sources from debian -SRC_URI = "${DEBIAN_MIRROR}/main/c/${BPN}/${BPN}_${PV}.orig.tar.gz \ - file://0001-do-not-create-a-run-test-to-determine-order-of-bitfi.patch \ - file://0001-genisoimage-Fix-fprintf-format-errors.patch \ - file://0001-define-__THROW-to-avoid-build-issue-with-musl.patch \ - file://0002-Do-not-use-rcmd-on-build-with-musl.patch \ - file://0001-genisoimage-Add-missing-extern-definition.patch \ - " -SRC_URI[md5sum] = "efe08e2f3ca478486037b053acd512e9" -SRC_URI[sha256sum] = "d1c030756ecc182defee9fe885638c1785d35a2c2a297b4604c0e0dcc78e47da" - -inherit cmake - -DEPENDS = "libcap file bzip2" -RDEPENDS_dirsplit = "perl" - -RDEPENDS_${PN}-dev = "" - -PACKAGES =+ "dirsplit genisoimage icedax wodim" - -FILES_dirsplit = " \ - ${bindir}/dirsplit \ -" - -FILES_genisoimage = " \ - ${bindir}/devdump \ - ${bindir}/genisoimage \ - ${bindir}/isodebug \ - ${bindir}/isodump \ - ${bindir}/isoinfo \ - ${bindir}/isovfy \ - ${bindir}/mkisofs \ -" - -FILES_icedax = " \ - ${bindir}/cdda2mp3 \ - ${bindir}/cdda2ogg \ - ${bindir}/icedax \ - ${bindir}/pitchplay \ - ${bindir}/readmult \ -" - -FILES_wodim = " \ - ${bindir}/readom \ - ${bindir}/wodim \ - ${sbindir}/netscsid \ -" - -do_install_append() { - ln -sf ${bindir}/genisoimage ${D}${bindir}/mkisofs -} - -BBCLASSEXTEND = "native" diff --git a/meta-openeuler/recipes-devtools/cdrkit/files/0001-define-__THROW-to-avoid-build-issue-with-musl.patch b/meta-openeuler/recipes-devtools/cdrkit/files/0001-define-__THROW-to-avoid-build-issue-with-musl.patch deleted file mode 100644 index b3beb069eb393db8dad5d5b95c2c353ff872ade4..0000000000000000000000000000000000000000 --- a/meta-openeuler/recipes-devtools/cdrkit/files/0001-define-__THROW-to-avoid-build-issue-with-musl.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 7c3036609494296f7c29413bf3acba829c81f62c Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Sat, 8 Aug 2015 22:58:57 +0200 -Subject: [PATCH 1/2] define __THROW to avoid build issue with musl - -Fixes: -http://autobuild.buildroot.net/results/d27/d2781e70b04a207e2e9397d888032294c7285034/build-end.log - -Signed-off-by: Romain Naour ---- - genisoimage/sha256.h | 4 ++++ - genisoimage/sha512.h | 4 ++++ - 2 files changed, 8 insertions(+) - -diff --git a/genisoimage/sha256.h b/genisoimage/sha256.h -index e7f4cb9..bcae7ef 100644 ---- a/genisoimage/sha256.h -+++ b/genisoimage/sha256.h -@@ -29,6 +29,10 @@ - #include - #include - -+/* define __THROW to avoid build issue when it's not available from the libc */ -+#ifndef __THROW -+# define __THROW -+#endif - - /* Structure to save state of computation between the single steps. */ - struct sha256_ctx -diff --git a/genisoimage/sha512.h b/genisoimage/sha512.h -index 7298355..8cee8b0 100644 ---- a/genisoimage/sha512.h -+++ b/genisoimage/sha512.h -@@ -29,6 +29,10 @@ - #include - #include - -+/* define __THROW to avoid build issue when it's not available from the libc */ -+#ifndef __THROW -+# define __THROW -+#endif - - /* Structure to save state of computation between the single steps. */ - struct sha512_ctx --- -2.14.1 - diff --git a/meta-openeuler/recipes-devtools/cdrkit/files/0001-do-not-create-a-run-test-to-determine-order-of-bitfi.patch b/meta-openeuler/recipes-devtools/cdrkit/files/0001-do-not-create-a-run-test-to-determine-order-of-bitfi.patch deleted file mode 100644 index c9725cb064af4f4c103d0e4fdcff5d3f2cd4736c..0000000000000000000000000000000000000000 --- a/meta-openeuler/recipes-devtools/cdrkit/files/0001-do-not-create-a-run-test-to-determine-order-of-bitfi.patch +++ /dev/null @@ -1,53 +0,0 @@ -From a702cd1bb5eba5a05d1098862b5b863a3f6dd558 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Thu, 10 Sep 2015 09:39:13 +0200 -Subject: [PATCH] do not create a run test to determine order of bitfields -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -taken from [1] - -Upstream-Status: Inappropriate [cross compile specific] - -[1] http://cgit.openembedded.org/openembedded/tree/recipes/cdrkit/cdrkit/xconfig.patch - -Signed-off-by: Andreas Müller ---- - include/CMakeLists.txt | 2 -- - include/xconfig.h.in | 6 +++++- - 2 files changed, 5 insertions(+), 3 deletions(-) - -diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt -index 99a69fd..e5ba8a7 100644 ---- a/include/CMakeLists.txt -+++ b/include/CMakeLists.txt -@@ -35,8 +35,6 @@ endif(VA_LIST_IS_ARRAY) - INCLUDE(TestBigEndian) - TEST_BIG_ENDIAN(WORDS_BIGENDIAN) - --TRY_RUN(BITFIELDS_HTOL TEST_DUMMY ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/test_BITFIELDS_HTOL.c) -- - INCLUDE(CheckIncludeFiles) - - #SET(CMAKE_REQUIRED_INCLUDES "/usr/include;/usr/local/include") -diff --git a/include/xconfig.h.in b/include/xconfig.h.in -index c130600..476c00b 100644 ---- a/include/xconfig.h.in -+++ b/include/xconfig.h.in -@@ -233,7 +233,11 @@ - /* If using network byte order */ - #cmakedefine WORDS_BIGENDIAN - /* If high bits come first in structures */ --#cmakedefine BITFIELDS_HTOL -+#ifdef WORDS_BIGENDIAN -+#define BITFIELDS_HTOL -+#else -+#define BITFIELDS_LTOH -+#endif - #define HAVE_C_BIGENDIAN /* Flag that WORDS_BIGENDIAN test was done */ - #define HAVE_C_BITFIELDS /* Flag that BITFIELDS_HTOL test was done */ - --- -2.1.0 - diff --git a/meta-openeuler/recipes-devtools/cdrkit/files/0001-genisoimage-Add-missing-extern-definition.patch b/meta-openeuler/recipes-devtools/cdrkit/files/0001-genisoimage-Add-missing-extern-definition.patch deleted file mode 100644 index 809d3afd7696b775b3968c481674d837b2a13410..0000000000000000000000000000000000000000 --- a/meta-openeuler/recipes-devtools/cdrkit/files/0001-genisoimage-Add-missing-extern-definition.patch +++ /dev/null @@ -1,29 +0,0 @@ -From fd5251cc8b82ce7a5f907c5129969097d75609fe Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Thu, 13 Aug 2020 17:38:59 -0700 -Subject: [PATCH] genisoimage: Add missing extern definition - -Fixed build with gcc10 - -Upstream-Status: Pending -Signed-off-by: Khem Raj ---- - genisoimage/genisoimage.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/genisoimage/genisoimage.h b/genisoimage/genisoimage.h -index bbedfb0..82c859b 100644 ---- a/genisoimage/genisoimage.h -+++ b/genisoimage/genisoimage.h -@@ -376,7 +376,7 @@ extern int use_fileversion; - extern int split_SL_component; - extern int split_SL_field; - extern char *trans_tbl; --char *outfile; -+extern char *outfile; - - #define JMAX 64 /* maximum Joliet file name length (spec) */ - #define JLONGMAX 103 /* out of spec Joliet file name length */ --- -2.28.0 - diff --git a/meta-openeuler/recipes-devtools/cdrkit/files/0001-genisoimage-Fix-fprintf-format-errors.patch b/meta-openeuler/recipes-devtools/cdrkit/files/0001-genisoimage-Fix-fprintf-format-errors.patch deleted file mode 100644 index f52f71b632d9e5907c4d7093a08e90688e0fc98e..0000000000000000000000000000000000000000 --- a/meta-openeuler/recipes-devtools/cdrkit/files/0001-genisoimage-Fix-fprintf-format-errors.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 8547f23c4416ed98f585c53c62e7d8afd8edab36 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Tue, 27 Jun 2017 21:05:31 -0700 -Subject: [PATCH] genisoimage: Fix fprintf format errors - -Signed-off-by: Khem Raj ---- - genisoimage/genisoimage.c | 4 ++-- - genisoimage/tree.c | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/genisoimage/genisoimage.c b/genisoimage/genisoimage.c -index 46f0cb7..9089081 100644 ---- a/genisoimage/genisoimage.c -+++ b/genisoimage/genisoimage.c -@@ -3406,7 +3406,7 @@ if (check_session == 0) - if (goof) { - fprintf(stderr, "ISO9660/Rock Ridge tree sort failed.\n"); - if(merge_warn_msg) -- fprintf(stderr, merge_warn_msg); -+ fprintf(stderr, "%s", merge_warn_msg); - exit(1); - } - #ifdef UDF -@@ -3419,7 +3419,7 @@ if (check_session == 0) - if (goof) { - fprintf(stderr, "Joliet tree sort failed. The -joliet-long switch may help you.\n"); - if(merge_warn_msg) -- fprintf(stderr, merge_warn_msg); -+ fprintf(stderr, "%s", merge_warn_msg); - exit(1); - } - /* -diff --git a/genisoimage/tree.c b/genisoimage/tree.c -index 7805888..8412cc3 100644 ---- a/genisoimage/tree.c -+++ b/genisoimage/tree.c -@@ -647,7 +647,7 @@ got_valid_name: - fprintf(stderr, "Unable to sort directory %s\n", - this_dir->whole_name); - if(merge_warn_msg) -- fprintf(stderr, merge_warn_msg); -+ fprintf(stderr, "%s", merge_warn_msg); - exit(1); - } - /* --- -2.13.2 - diff --git a/meta-openeuler/recipes-devtools/cdrkit/files/0002-Do-not-use-rcmd-on-build-with-musl.patch b/meta-openeuler/recipes-devtools/cdrkit/files/0002-Do-not-use-rcmd-on-build-with-musl.patch deleted file mode 100644 index 547a21c67f623995785c26116cf0ae9f53bc8bc5..0000000000000000000000000000000000000000 --- a/meta-openeuler/recipes-devtools/cdrkit/files/0002-Do-not-use-rcmd-on-build-with-musl.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 510838b2c96a9b097b3ee2694cba1c3623b0bac7 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Thu, 21 Sep 2017 22:38:05 -0700 -Subject: [PATCH 2/2] Do not use rcmd on build with musl - -cdrkit unconditionally enables code using rcmd(3), which isn't available -on musl. - -Signed-off-by: Khem Raj ---- - include/xconfig.h.in | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/include/xconfig.h.in b/include/xconfig.h.in -index 476c00b..6b4b298 100644 ---- a/include/xconfig.h.in -+++ b/include/xconfig.h.in -@@ -186,8 +186,9 @@ - * Instead use the tests AC_SMALL_FSEEKO/AC_SMALL/STELLO and make sure - * they are placed before the large file tests. - */ -- -+#ifdef __GLIBC__ - #define HAVE_RCMD 1 /* rcmd() is present in libc/libsocket */ -+#endif - #define HAVE_SOCKET 1 /* socket() is present in libc/libsocket */ - #define HAVE_SOCKETPAIR 1 /* socketpair() is present in libc/libsocket */ - #define HAVE_GETSERVBYNAME 1 /* getservbyname() is present in libc/libsocket */ --- -2.14.1 - diff --git a/meta-openeuler/recipes-devtools/cdrtools/cdrtools-native_%.bbappend b/meta-openeuler/recipes-devtools/cdrtools/cdrtools-native_%.bbappend new file mode 100644 index 0000000000000000000000000000000000000000..41b10cf688ff0632a039110dd044a540615154e9 --- /dev/null +++ b/meta-openeuler/recipes-devtools/cdrtools/cdrtools-native_%.bbappend @@ -0,0 +1,12 @@ +# main bbfile: yocto-poky/meta/recipes-devtools/cdrtools/cdrtools-native_3.01.bb + +# files, patches can't be applied in openeuler or conflict with openeuler +SRC_URI_remove = " \ + ${SOURCEFORGE_MIRROR}/project/cdrtools/cdrtools-${PV}.tar.bz2 \ +" + +# files, patches that come from openeuler +FILESEXTRAPATHS_append := "${THISDIR}/files/:" +SRC_URI_prepend = " \ + file://cdrtools-${PV}.tar.bz2 \ +" diff --git a/meta-openeuler/recipes-devtools/cdrtools/files/cdrtools-3.01.tar.bz2 b/meta-openeuler/recipes-devtools/cdrtools/files/cdrtools-3.01.tar.bz2 new file mode 100644 index 0000000000000000000000000000000000000000..b8f9324da04024266da2b74464a6bf7e2f905bec Binary files /dev/null and b/meta-openeuler/recipes-devtools/cdrtools/files/cdrtools-3.01.tar.bz2 differ diff --git a/scripts/download_code.sh b/scripts/download_code.sh index 072bd2ddab46f3d0ff3ed95d589d1a9ef5959c80..df98f6d7342a53eb0d1013bf34b4a3ea257ea364 100644 --- a/scripts/download_code.sh +++ b/scripts/download_code.sh @@ -220,7 +220,6 @@ download_code() update_code_repo src-openeuler/groff ${SRC_BRANCH} update_code_repo src-openeuler/nasm ${SRC_BRANCH} update_code_repo src-openeuler/syslinux ${SRC_BRANCH} - update_code_repo src-openeuler/cdrkit ${SRC_BRANCH} update_code_repo src-openeuler/yocto-opkg-utils ${SRC_BRANCH} update_code_repo src-openeuler/python3 ${SRC_BRANCH} update_code_repo src-openeuler/libgpg-error ${SRC_BRANCH} @@ -231,6 +230,8 @@ download_code() # using higher version, otherwise there are too many cve patches to apply. update_code_repo src-openeuler/dbus openEuler-22.09 update_code_repo src-openeuler/wpa_supplicant openEuler-22.09 + # corss-localedef-native using glibc source code + update_code_repo src-openeuler/glibc ${SRC_BRANCH} } # download iSulad related packages