diff --git a/meta-openeuler/recipes-devtools/cdrkit/cdrkit_%.bbappend b/meta-openeuler/recipes-devtools/cdrkit/cdrkit_%.bbappend new file mode 100644 index 0000000000000000000000000000000000000000..15861ee51bcb8cf0241e4650d2067bcffd60c559 --- /dev/null +++ b/meta-openeuler/recipes-devtools/cdrkit/cdrkit_%.bbappend @@ -0,0 +1,42 @@ +# 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" + +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 new file mode 100644 index 0000000000000000000000000000000000000000..b9ee03425e70c6d2c2b67bcc0a41915f276ffb50 --- /dev/null +++ b/meta-openeuler/recipes-devtools/cdrkit/cdrkit_1.1.11.bb @@ -0,0 +1,59 @@ +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 new file mode 100644 index 0000000000000000000000000000000000000000..b3beb069eb393db8dad5d5b95c2c353ff872ade4 --- /dev/null +++ b/meta-openeuler/recipes-devtools/cdrkit/files/0001-define-__THROW-to-avoid-build-issue-with-musl.patch @@ -0,0 +1,47 @@ +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 new file mode 100644 index 0000000000000000000000000000000000000000..c9725cb064af4f4c103d0e4fdcff5d3f2cd4736c --- /dev/null +++ b/meta-openeuler/recipes-devtools/cdrkit/files/0001-do-not-create-a-run-test-to-determine-order-of-bitfi.patch @@ -0,0 +1,53 @@ +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 new file mode 100644 index 0000000000000000000000000000000000000000..809d3afd7696b775b3968c481674d837b2a13410 --- /dev/null +++ b/meta-openeuler/recipes-devtools/cdrkit/files/0001-genisoimage-Add-missing-extern-definition.patch @@ -0,0 +1,29 @@ +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 new file mode 100644 index 0000000000000000000000000000000000000000..f52f71b632d9e5907c4d7093a08e90688e0fc98e --- /dev/null +++ b/meta-openeuler/recipes-devtools/cdrkit/files/0001-genisoimage-Fix-fprintf-format-errors.patch @@ -0,0 +1,49 @@ +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 new file mode 100644 index 0000000000000000000000000000000000000000..547a21c67f623995785c26116cf0ae9f53bc8bc5 --- /dev/null +++ b/meta-openeuler/recipes-devtools/cdrkit/files/0002-Do-not-use-rcmd-on-build-with-musl.patch @@ -0,0 +1,31 @@ +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/nasm/nasm_%.bbappend b/meta-openeuler/recipes-devtools/nasm/nasm_%.bbappend new file mode 100644 index 0000000000000000000000000000000000000000..1252ffa7063e4a7283bfdf0795f69fd4695ab26b --- /dev/null +++ b/meta-openeuler/recipes-devtools/nasm/nasm_%.bbappend @@ -0,0 +1,6 @@ +# main bbfile: yocto-poky/meta/recipes-devtools/nasm/nasm_2.15.05.bb + +# files, patches that come from openeuler +SRC_URI_prepend = " \ + file://enable-make-check.patch \ +" diff --git a/meta-openeuler/recipes-extended/groff/groff_%.bbappend b/meta-openeuler/recipes-extended/groff/groff_%.bbappend new file mode 100644 index 0000000000000000000000000000000000000000..37e71b1bb5dfde73e56a9b26fdb022c1d380b498 --- /dev/null +++ b/meta-openeuler/recipes-extended/groff/groff_%.bbappend @@ -0,0 +1,2 @@ +# main bbfile: yocto-poky/meta/recipes-extended/groff/groff_1.22.4.bb + diff --git a/meta-openeuler/recipes-support/db/db_%.bbappend b/meta-openeuler/recipes-support/db/db_%.bbappend new file mode 100644 index 0000000000000000000000000000000000000000..1c31643c1bf06c061d6496df972cf5aead075523 --- /dev/null +++ b/meta-openeuler/recipes-support/db/db_%.bbappend @@ -0,0 +1,38 @@ +# main bbfile: yocto-poky/meta/recipes-support/db/db_5.3.28.bb + +# files, patches can't be applied in openeuler or conflict with openeuler +# patches that apply fail: +# 0001-atomic-Rename-local-__atomic_compare_exchange-to-avo.patch +SRC_URI_remove = " \ + https://download.oracle.com/berkeley-db/db-${PV}.tar.gz \ + file://0001-atomic-Rename-local-__atomic_compare_exchange-to-avo.patch \ +" + +# files, patches that come from openeuler +# patches that apply fail: +# add-check-for-device-number-in-__check_lock_fn.patch +# bugfix-fix-deadlock-on-mempool-file-locks.patch +# db-1.85-errno.patch +# db-5.3.28-condition-variable-ppc.patch +# db-5.3.28-rpm-lock-check.patch +# patches that compile fail: "undefined reference to `__os_pthreads_timestamp'" +# db-5.3.28-condition_variable.patch +SRC_URI_prepend = " \ + file://libdb/${BP}.tar.gz \ + file://libdb/007-mt19937db.c_license.patch \ + file://libdb/backport-CVE-2019-2708-Resolved-data-store-execution-which-led-to-partial-DoS.patch \ + file://libdb/checkpoint-opd-deadlock.patch \ + file://libdb/db-4.5.20-jni-include-dir.patch \ + file://libdb/db-4.6.21-1.85-compat.patch \ + file://libdb/db-5.3.21-memp_stat-upstream-fix.patch \ + file://libdb/db-5.3.21-mutex_leak.patch \ + file://libdb/db-5.3.28-atomic_compare_exchange.patch \ + file://libdb/db-5.3.28-cwd-db_config.patch \ + file://libdb/db-5.3.28-lemon_hash.patch \ + file://libdb/fix-a-potential-infinite-loop.patch \ + file://libdb/java8-fix.patch \ + file://libdb/libdb-5.3.21-region-size-check.patch \ + file://libdb/libdb-cbd-race.patch \ + file://libdb/libdb-limit-cpu.patch \ + file://libdb/libdb-multiarch.patch \ +" diff --git a/scripts/download_code.sh b/scripts/download_code.sh index aaa6b11487c5b4efd8ee5936c1d9a3959e654f84..b27df58ce295b21e3728f4aa3950bb7c88a71c73 100644 --- a/scripts/download_code.sh +++ b/scripts/download_code.sh @@ -214,6 +214,11 @@ download_code() update_code_repo src-openeuler/sqlite ${SRC_BRANCH} update_code_repo src-openeuler/bison ${SRC_BRANCH} update_code_repo src-openeuler/perl ${SRC_BRANCH} + update_code_repo src-openeuler/libdb ${SRC_BRANCH} + 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} } # download iSulad related packages