markus.lehr/yoctor-layers
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added my Recipes

Browse Source
This commit is contained in:
Markus Lehr
2024-07-11 14:16:35 +02:00
parent 38bc4f53ac
commit 09b621d929
7118 changed files with 525762 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

335
meta-openembedded/meta-oe/recipes-multimedia/cdrkit/files/0001-add-new-option-eltorito-platform.patch Normal file
View File

@@ -0,0 +1,335 @@
From 5a2d571f3687910260c45841725f2deb84c8f12e Mon Sep 17 00:00:00 2001
From: Hongxu Jia <hongxu.jia@windriver.com>
Date: Mon, 25 Apr 2022 18:18:00 +0800
Subject: [PATCH] add new option -eltorito-platform
Mkisofs now correctly supports El Torito multi boot entries by introducing
a Boot Dection Header before a list of alternate boot entries.
New option -eltorito-platform allows to set the El Torito platform id
for a boot entry or for a list of boot entries. Supported values for
the parameter are:
- x86 the standard value vor x86 based PCs
- PPC the Power PC platform
- Mac The Apple Mac platform
- efi EFI based boot for PCs
- # an arbitrary numerical value
Upstream-Status: Inappropriate [port from cdrtools]
https://github.com/jobermayr/cdrtools/commit/a50804fd61d75eb689a515dbfca6968ca2296fd7
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
genisoimage/eltorito.c | 73 +++++++++++++++++++++++++++++++++++++--
genisoimage/genisoimage.c | 47 +++++++++++++++++++++++++
genisoimage/genisoimage.h | 8 +++++
genisoimage/iso9660.h | 33 ++++++++++++++++--
4 files changed, 157 insertions(+), 4 deletions(-)
diff --git a/genisoimage/eltorito.c b/genisoimage/eltorito.c
index d52e17e..a804988 100644
--- a/genisoimage/eltorito.c
+++ b/genisoimage/eltorito.c
@@ -56,6 +56,7 @@ static unsigned int bcat_de_flags;
void init_boot_catalog(const char *path);
void insert_boot_cat(void);
static void get_torito_desc(struct eltorito_boot_descriptor *boot_desc);
+static void fill_boot_shdr(struct eltorito_sectionheader_entry *boot_shdr_entry, int arch);
static void fill_boot_desc(struct eltorito_defaultboot_entry *boot_desc_entry,
struct eltorito_boot_entry_info *boot_entry);
void get_boot_entry(void);
@@ -282,7 +283,14 @@ get_torito_desc(struct eltorito_boot_descriptor *boot_desc)
struct directory_entry *de2; /* Boot catalog */
int i;
int offset;
+ int arch = 0;
+ int nentries = 0;
struct eltorito_defaultboot_entry boot_desc_record;
+ struct eltorito_sectionheader_entry boot_shdr_record;
+#ifdef __needed__
+ struct eltorito_section_entry boot_section_record;
+#endif
+ struct eltorito_sectionheader_entry *last_section_header = 0;
memset(boot_desc, 0, sizeof (*boot_desc));
boot_desc->type[0] = 0;
@@ -311,13 +319,22 @@ get_torito_desc(struct eltorito_boot_descriptor *boot_desc)
set_731(boot_desc->bootcat_ptr,
(unsigned int) get_733(de2->isorec.extent));
+ /*
+ * If the platform id for the first (default) boot entry has not been
+ * explicitly set, we default to EL_TORITO_ARCH_x86
+ */
+ if ((first_boot_entry->type & ELTORITO_BOOT_ID) == 0) {
+ first_boot_entry->boot_platform = EL_TORITO_ARCH_x86;
+ }
+ arch = first_boot_entry->boot_platform;
+
/*
* we have the boot image, so write boot catalog information
* Next we write out the primary descriptor for the disc
*/
memset(&valid_desc, 0, sizeof (valid_desc));
valid_desc.headerid[0] = 1;
- valid_desc.arch[0] = EL_TORITO_ARCH_x86;
+ valid_desc.arch[0] = arch; /* Platform id for the default boot */
/*
* we'll shove start of publisher id into id field,
@@ -351,8 +368,17 @@ get_torito_desc(struct eltorito_boot_descriptor *boot_desc)
current_boot_entry != NULL;
current_boot_entry = current_boot_entry->next,
offset += sizeof (boot_desc_record)) {
+ int newarch = arch;
- if (offset >= SECTOR_SIZE) {
+ if (current_boot_entry->type & ELTORITO_BOOT_ID)
+ newarch = current_boot_entry->boot_platform;
+ else
+ current_boot_entry->boot_platform = arch;
+
+ /*
+ * El Torito has no such limitation but we currently have...
+ */
+ if (offset >= (SECTOR_SIZE - sizeof (boot_desc_record))) {
#ifdef USE_LIBSCHILY
comerrno(EX_BAD,
"Too many El Torito boot entries\n");
@@ -362,12 +388,53 @@ get_torito_desc(struct eltorito_boot_descriptor *boot_desc)
exit(1);
#endif
}
+
+ if (current_boot_entry == first_boot_entry) {
+ ;
+ /* EMPTY */
+ } else if ((current_boot_entry == first_boot_entry->next) ||
+ (arch != newarch) ||
+ (current_boot_entry->type & ELTORITO_SECTION_HEADER)) {
+ if (last_section_header)
+ set_721(&last_section_header->entry_count, nentries);
+ nentries = 1;
+ last_section_header = (struct eltorito_sectionheader_entry *)
+ (de2->table + offset);
+ fill_boot_shdr(&boot_shdr_record, newarch);
+ memcpy(de2->table + offset, &boot_shdr_record,
+ sizeof (boot_shdr_record));
+ offset += sizeof (boot_desc_record);
+ } else {
+ nentries++; /* Add entry to this section header */
+ }
+ /*
+ * This works because a section entry has the same essential
+ * layout as a default entry (and we do not populate the
+ * selection criteria fields).
+ */
+
fill_boot_desc(&boot_desc_record, current_boot_entry);
memcpy(de2->table + offset, &boot_desc_record,
sizeof (boot_desc_record));
}
+
+ if (last_section_header) {
+ set_721(&last_section_header->entry_count, nentries);
+ last_section_header->header_id[0] = EL_TORITO_SHDR_ID_LAST_SHDR;
+ }
+
}/* get_torito_desc(... */
+static void
+fill_boot_shdr(boot_shdr_entry, arch)
+ struct eltorito_sectionheader_entry *boot_shdr_entry;
+ int arch;
+{
+ memset(boot_shdr_entry, 0, sizeof(struct eltorito_sectionheader_entry));
+ boot_shdr_entry->header_id[0] = EL_TORITO_SHDR_ID_SHDR;
+ boot_shdr_entry->platform_id[0] = arch;
+}
+
static void
fill_boot_desc(struct eltorito_defaultboot_entry *boot_desc_entry,
struct eltorito_boot_entry_info *boot_entry)
@@ -678,7 +745,9 @@ get_boot_entry()
if (!first_boot_entry) {
first_boot_entry = current_boot_entry;
last_boot_entry = current_boot_entry;
+ current_boot_entry->boot_platform = EL_TORITO_ARCH_x86;
} else {
+ current_boot_entry->boot_platform = last_boot_entry->boot_platform;
last_boot_entry->next = current_boot_entry;
last_boot_entry = current_boot_entry;
}
diff --git a/genisoimage/genisoimage.c b/genisoimage/genisoimage.c
index 9089081..84ac3c2 100644
--- a/genisoimage/genisoimage.c
+++ b/genisoimage/genisoimage.c
@@ -271,6 +271,8 @@ struct rcopts {
char **variable;
};
+static int get_boot_platid(char *opt_arg);
+
struct rcopts rcopt[] = {
{"PREP", &preparer},
{"PUBL", &publisher},
@@ -404,6 +406,7 @@ struct ld_option {
#define OPTION_ALLOW_LEADING_DOTS 1070
#define OPTION_PUBLISHER 1071
+#define OPTION_PLATFORM 1072
#ifdef JIGDO_TEMPLATE
#define OPTION_JTT_OUTPUT 1101
@@ -528,6 +531,8 @@ static const struct ld_option ld_options[] =
'b', "FILE", "Set El Torito boot image name", ONE_DASH},
{{"eltorito-alt-boot", no_argument, NULL, OPTION_ALT_BOOT},
'\0', NULL, "Start specifying alternative El Torito boot parameters", ONE_DASH},
+ {{"eltorito-platform", required_argument, NULL, OPTION_PLATFORM},
+ '\0', "ID", "Set El Torito platform id for the next boot entry", ONE_DASH},
{{"sparc-boot", required_argument, NULL, 'B'},
'B', "FILES", "Set sparc boot image names", ONE_DASH},
{{"sunx86-boot", required_argument, NULL, OPTION_SUNX86BOOT},
@@ -1558,6 +1563,9 @@ int main(int argc, char *argv[])
*/
new_boot_entry();
break;
+ case OPTION_PLATFORM:
+ get_boot_platid(optarg);
+ break;
case OPTION_BOOTALPHA:
use_alphaboot++;
/* list of pathnames of boot images */
@@ -3829,3 +3837,42 @@ e_malloc(size_t size)
memset(pt, 0, size);
return (pt);
}
+
+static int
+get_boot_platid(char *opt_arg)
+{
+ long val;
+ char *ptr;
+
+ use_eltorito++;
+ if (streql(opt_arg, "x86")) {
+ val = EL_TORITO_ARCH_x86;
+ } else if (streql(opt_arg, "PPC")) {
+ val = EL_TORITO_ARCH_PPC;
+ } else if (streql(opt_arg, "Mac")) {
+ val = EL_TORITO_ARCH_PPC;
+ } else if (streql(opt_arg, "efi")) {
+ val = EL_TORITO_ARCH_EFI;
+ } else {
+ val = strtol(opt_arg, &ptr, 0);
+ if (*ptr || val < 0 || val >= 0x100) {
+ comerrno(EX_BAD, "Bad boot system ID.\n");
+ }
+ }
+
+ /*
+ * If there is already a boot entry and the boot file name has been set
+ * for this boot entry and the new platform id differs from the
+ * previous value, we start a new boot section.
+ */
+ if (current_boot_entry &&
+ current_boot_entry->boot_image != NULL &&
+ current_boot_entry->boot_platform != val) {
+ new_boot_entry();
+ }
+ get_boot_entry();
+ current_boot_entry->type |= ELTORITO_BOOT_ID;
+ current_boot_entry->boot_platform = val;
+ return (1);
+}
+
diff --git a/genisoimage/genisoimage.h b/genisoimage/genisoimage.h
index 82c859b..1170d89 100644
--- a/genisoimage/genisoimage.h
+++ b/genisoimage/genisoimage.h
@@ -299,6 +299,14 @@ struct eltorito_boot_entry_info {
int boot_info_table;
int load_size;
int load_addr;
+
+#define ELTORITO_BOOT_ID 1
+#define ELTORITO_SECTION_HEADER 2
+ int type;
+ /*
+ * Valid if (type & ELTORITO_BOOT_ID) != 0
+ */
+ int boot_platform;
};
extern int goof;
diff --git a/genisoimage/iso9660.h b/genisoimage/iso9660.h
index c74c2a9..61b6fc0 100644
--- a/genisoimage/iso9660.h
+++ b/genisoimage/iso9660.h
@@ -62,6 +62,7 @@ struct iso_volume_descriptor {
#define EL_TORITO_ARCH_x86 0
#define EL_TORITO_ARCH_PPC 1
#define EL_TORITO_ARCH_MAC 2
+#define EL_TORITO_ARCH_EFI 0xEF
#define EL_TORITO_BOOTABLE 0x88
#define EL_TORITO_NOT_BOOTABLE 0
@@ -159,10 +160,15 @@ struct eltorito_boot_descriptor {
};
/* Validation entry for El Torito */
+/*
+ * headerid must be 1
+ * id is the manufacturer ID
+ * cksum to make the sum of all shorts in this record 0
+ */
struct eltorito_validation_entry {
char headerid [ISODCL(1, 1)]; /* 711 */
char arch [ISODCL(2, 2)];
- char pad1 [ISODCL(3, 4)]; /* 711 */
+ char pad1 [ISODCL(3, 4)]; /* 721 */
char id [ISODCL(5, 28)]; /* CD devel/man*/
char cksum [ISODCL(29, 30)];
char key1 [ISODCL(31, 31)];
@@ -173,7 +179,7 @@ struct eltorito_validation_entry {
struct eltorito_defaultboot_entry {
char boot_id [ISODCL(1, 1)]; /* 711 */
char boot_media [ISODCL(2, 2)];
- char loadseg [ISODCL(3, 4)]; /* 711 */
+ char loadseg [ISODCL(3, 4)]; /* 721 */
char sys_type [ISODCL(5, 5)];
char pad1 [ISODCL(6, 6)];
char nsect [ISODCL(7, 8)];
@@ -181,6 +187,29 @@ struct eltorito_defaultboot_entry {
char pad2 [ISODCL(13, 32)];
};
+/* El Torito section header entry in boot catalog */
+struct eltorito_sectionheader_entry {
+#define EL_TORITO_SHDR_ID_SHDR 0x90
+#define EL_TORITO_SHDR_ID_LAST_SHDR 0x91
+ char header_id [ISODCL(1, 1)]; /* 711 */
+ char platform_id [ISODCL(2, 2)];
+ char entry_count [ISODCL(3, 4)]; /* 721 */
+ char id [ISODCL(5, 32)];
+};
+
+/* El Torito section entry in boot catalog */
+struct eltorito_section_entry {
+ char boot_id [ISODCL(1, 1)]; /* 711 */
+ char boot_media [ISODCL(2, 2)];
+ char loadseg [ISODCL(3, 4)]; /* 721 */
+ char sys_type [ISODCL(5, 5)];
+ char pad1 [ISODCL(6, 6)];
+ char nsect [ISODCL(7, 8)];
+ char bootoff [ISODCL(9, 12)];
+ char sel_criteria [ISODCL(13, 13)];
+ char vendor_sel_criteria [ISODCL(14, 32)];
+};
+
/*
* XXX JS: The next two structures have odd lengths!
* Some compilers (e.g. on Sun3/mc68020) padd the structures to even length.
--
2.27.0

47
meta-openembedded/meta-oe/recipes-multimedia/cdrkit/files/0001-define-__THROW-to-avoid-build-issue-with-musl.patch Normal file
View File

@@ -0,0 +1,47 @@
From 7c3036609494296f7c29413bf3acba829c81f62c Mon Sep 17 00:00:00 2001
From: Romain Naour <romain.naour@openwide.fr>
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 <romain.naour@openwide.fr>
---
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 <stdint.h>
#include <stdio.h>
+/* 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 <stdint.h>
#include <stdio.h>
+/* 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

53
meta-openembedded/meta-oe/recipes-multimedia/cdrkit/files/0001-do-not-create-a-run-test-to-determine-order-of-bitfi.patch Normal file
View File

@@ -0,0 +1,53 @@
From a702cd1bb5eba5a05d1098862b5b863a3f6dd558 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
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 <schnitzeltony@googlemail.com>
---
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

44
meta-openembedded/meta-oe/recipes-multimedia/cdrkit/files/0001-genisoimage-Add-checksum.h-and-md5.h-for-function-pr.patch Normal file
View File

@@ -0,0 +1,44 @@
From f28b8ec20c3485068f1617ff93b497bafe5264e1 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Sat, 3 Sep 2022 00:50:17 -0700
Subject: [PATCH] genisoimage: Add checksum.h and md5.h for function prototypes
Needed for parse_checksum_algo and calculate_md5sum
Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
genisoimage/genisoimage.c | 2 ++
genisoimage/jte.c | 2 ++
2 files changed, 4 insertions(+)
diff --git a/genisoimage/genisoimage.c b/genisoimage/genisoimage.c
index 84ac3c2..5c9f7f3 100644
--- a/genisoimage/genisoimage.c
+++ b/genisoimage/genisoimage.c
@@ -59,6 +59,8 @@
#include "udf.h"
#endif
+#include "checksum.h"
+
#ifdef NEED_O_BINARY
#include <io.h> /* for setmode() prototype */
#endif
diff --git a/genisoimage/jte.c b/genisoimage/jte.c
index 0dff289..1f03ad3 100644
--- a/genisoimage/jte.c
+++ b/genisoimage/jte.c
@@ -36,6 +36,8 @@
#include "vms.h"
#endif
+#include "md5.h"
+
/* Different types used in building our state list below */
#define JTET_FILE_MATCH 1
#define JTET_NOMATCH 2
--
2.37.3

29
meta-openembedded/meta-oe/recipes-multimedia/cdrkit/files/0001-genisoimage-Add-missing-extern-definition.patch Normal file
View File

@@ -0,0 +1,29 @@
From fd5251cc8b82ce7a5f907c5129969097d75609fe Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
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 <raj.khem@gmail.com>
---
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

49
meta-openembedded/meta-oe/recipes-multimedia/cdrkit/files/0001-genisoimage-Fix-fprintf-format-errors.patch Normal file
View File

@@ -0,0 +1,49 @@
From 8547f23c4416ed98f585c53c62e7d8afd8edab36 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Tue, 27 Jun 2017 21:05:31 -0700
Subject: [PATCH] genisoimage: Fix fprintf format errors
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
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

28
meta-openembedded/meta-oe/recipes-multimedia/cdrkit/files/0001-install-netscsid-to-bin-for-nativesdk.patch Normal file
View File

@@ -0,0 +1,28 @@
From 6b698b7c1045d279fe24818d45c67d9884d5fd81 Mon Sep 17 00:00:00 2001
From: Hongxu Jia <hongxu.jia@windriver.com>
Date: Fri, 7 May 2021 15:10:04 +0800
Subject: [PATCH] install netscsid to bin for nativesdk
For Yocto, the nativesdk does not have sbin dir, use bin to relpace
Upstream-Status: Inappropriate [oe specific]
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
netscsid/CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/netscsid/CMakeLists.txt b/netscsid/CMakeLists.txt
index f6bddf1..cf23312 100644
--- a/netscsid/CMakeLists.txt
+++ b/netscsid/CMakeLists.txt
@@ -9,5 +9,5 @@ ADD_EXECUTABLE (netscsid netscsid.c)
#SET_SOURCE_FILES_PROPERTIES(netscsid.c )
TARGET_LINK_LIBRARIES(netscsid ${EXTRA_LIBS} )
#SET_TARGET_PROPERTIES(netscsid PROPERTIES SKIP_BUILD_RPATH TRUE)
-INSTALL(TARGETS netscsid DESTINATION sbin)
+INSTALL(TARGETS netscsid DESTINATION bin)
--
2.27.0

31
meta-openembedded/meta-oe/recipes-multimedia/cdrkit/files/0002-Do-not-use-rcmd-on-build-with-musl.patch Normal file
View File

@@ -0,0 +1,31 @@
From 510838b2c96a9b097b3ee2694cba1c3623b0bac7 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
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 <raj.khem@gmail.com>
---
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