Skip to contentSkip to conversation

bsd-headers: Move next to musl recipes

PATCH In review Khem Raj 2 participants 5 messages Mar 2, 2018

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/4 bsd-headers: Move next to musl recipes

This helps communicate the dependency a bit better

Signed-off-by Khem Raj <[email protected]>
---
 meta/recipes-core/{bsd-headers => musl}/bsd-headers.bb          | 0
 meta/recipes-core/{bsd-headers => musl}/bsd-headers/sys-cdefs.h | 0
 meta/recipes-core/{bsd-headers => musl}/bsd-headers/sys-queue.h | 0
 meta/recipes-core/{bsd-headers => musl}/bsd-headers/sys-tree.h  | 0
 4 files changed, 0 insertions(+), 0 deletions(-)
 rename meta/recipes-core/{bsd-headers => musl}/bsd-headers.bb (100%)
 rename meta/recipes-core/{bsd-headers => musl}/bsd-headers/sys-cdefs.h (100%)
 rename meta/recipes-core/{bsd-headers => musl}/bsd-headers/sys-queue.h (100%)
 rename meta/recipes-core/{bsd-headers => musl}/bsd-headers/sys-tree.h (100%)
meta/recipes-core/musl/bsd-headers.bb renamed from meta/recipes-core/bsd-headers/bsd-headers.bb +0 -0
similarity index 100%
rename from meta/recipes-core/bsd-headers/bsd-headers.bb
rename to meta/recipes-core/musl/bsd-headers.bb
meta/recipes-core/musl/bsd-headers/sys-cdefs.h renamed from meta/recipes-core/bsd-headers/bsd-headers/sys-cdefs.h +0 -0
similarity index 100%
rename from meta/recipes-core/bsd-headers/bsd-headers/sys-cdefs.h
rename to meta/recipes-core/musl/bsd-headers/sys-cdefs.h
meta/recipes-core/musl/bsd-headers/sys-queue.h renamed from meta/recipes-core/bsd-headers/bsd-headers/sys-queue.h +0 -0
similarity index 100%
rename from meta/recipes-core/bsd-headers/bsd-headers/sys-queue.h
rename to meta/recipes-core/musl/bsd-headers/sys-queue.h
meta/recipes-core/musl/bsd-headers/sys-tree.h renamed from meta/recipes-core/bsd-headers/bsd-headers/sys-tree.h +0 -0
similarity index 100%
rename from meta/recipes-core/bsd-headers/bsd-headers/sys-tree.h
rename to meta/recipes-core/musl/bsd-headers/sys-tree.h
Signature · 1 line
2.16.2
author
#1 lore raw

PATCH 2/4 musl: Rename files/ directory to musl/

Since it holds musl specific patches, name it so

Signed-off-by Khem Raj <[email protected]>
---
 .../0001-Make-dynamic-linker-a-relative-symlink-to-libc.patch             | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename meta/recipes-core/musl/{files => musl}/0001-Make-dynamic-linker-a-relative-symlink-to-libc.patch (100%)
meta/recipes-core/musl/musl/0001-Make-dynamic-linker-a-relative-symlink-to-libc.patch renamed from meta/recipes-core/musl/files/0001-Make-dynamic-linker-a-relative-symlink-to-libc.patch +0 -0
similarity index 100%
rename from meta/recipes-core/musl/files/0001-Make-dynamic-linker-a-relative-symlink-to-libc.patch
rename to meta/recipes-core/musl/musl/0001-Make-dynamic-linker-a-relative-symlink-to-libc.patch
Signature · 1 line
2.16.2
author
#2 lore raw

PATCH 3/4 musl-utils: Add package

In reply to Khem Raj

This contains getconf, getent and iconv glibc compat utils

Signed-off-by Khem Raj <[email protected]>
---
 meta/recipes-core/musl/musl-utils.bb | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 meta/recipes-core/musl/musl-utils.bb
meta/recipes-core/musl/musl-utils.bb new file +25 -0
new file mode 100644
index 0000000000..74b846df59
@@ -0,0 +1,25 @@
+# Copyright (C) 2018 Khem Raj <[email protected]>
+# Released under the MIT license (see COPYING.MIT for the terms)
+
+DESCRIPTION = "getconf, getent and iconv implementations for musl"
+HOMEPAGE = "https://git.alpinelinux.org/cgit/aports/tree/main/musl"
+LICENSE = "BSD-2-Clause & GPL-2.0+"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=9d08215e611db87b357e8674b4b42564"
+SECTION = "utils"
+
+# Date of the commit in SRCREV
+PV = "20170421"
+
+SRCREV = "fb5630138ccabbbc14a19d372096a04e42573c7d"
+SRC_URI = "git://github.com/boltlinux/musl-utils"
+
+inherit autotools
+
+S = "${WORKDIR}/git"
+
+PACKAGES =+ "${PN}-iconv"
+
+FILES_${PN}-iconv = "${bindir}/iconv"
+
+COMPATIBLE_HOST = ".*-musl.*"
+
Signature · 1 line
2.16.2
#3 lore raw

Re: [PATCH 3/4] musl-utils: Add package

I've tested this against my new kernel-devsrc package when built on musl, and I can
confirm that it works. There's a warning about the flags, but everything still builds
and runs .. unlike before!

Cheers,

Bruce

root@qemux86-64:/lib/modules/4.14.19-yocto-standard/build# make ARCH=x86 scripts

getconf: LFS_CFLAGS: unknown variable
getconf: LFS_LDFLAGS: unknown variable
getconf: LFS_LIBS: unknown variable
HOSTCC scripts/basic/fixdep
HOSTCC scripts/basic/bin2c
getconf: LFS_CFLAGS: unknown variable
getconf: LFS_LDFLAGS: unknown variable
getconf: LFS_LIBS: unknown variable
HOSTCC scripts/kconfig/conf.o
SHIPPED scripts/kconfig/zconf.tab.c
SHIPPED scripts/kconfig/zconf.lex.c
HOSTCC scripts/kconfig/zconf.tab.o
HOSTLD scripts/kconfig/conf
scripts/kconfig/conf --silentoldconfig Kconfig

  WRAP    arch/x86/include/generated/asm/clkdev.h
  WRAP    arch/x86/include/generated/asm/dma-contiguous.h
  WRAP    arch/x86/include/generated/asm/early_ioremap.h
  WRAP    arch/x86/include/generated/asm/mcs_spinlock.h
  WRAP    arch/x86/include/generated/asm/mm-arch-hooks.h
  CC      scripts/mod/empty.o
  HOSTCC  scripts/mod/mk_elfconfig
  MKELF   scripts/mod/elfconfig.h
  HOSTCC  scripts/mod/modpost.o
  CC      scripts/mod/devicetable-offsets.s
  CHK     scripts/mod/devicetable-offsets.h
  UPD     scripts/mod/devicetable-offsets.h
  HOSTCC  scripts/mod/file2alias.o
  HOSTCC  scripts/mod/sumversion.o
  HOSTLD  scripts/mod/modpost
  HOSTCC  scripts/kallsyms
  HOSTCC  scripts/conmakehash
  HOSTCC  scripts/recordmcount
root@qemux86-64:~# mv hellomod_makefile Makefile
root@qemux86-64:~# make
make -C /usr/src/kernel M=/home/root modules
make[1]: Entering directory '/lib/modules/4.14.19-yocto-standard/build'
getconf: LFS_CFLAGS: unknown variable
getconf: LFS_LDFLAGS: unknown variable
getconf: LFS_LIBS: unknown variable
  CC [M]  /home/root/hellomod.o
  Building modules, stage 2.
  MODPOST 1 modules
  CC      /home/root/hellomod.mod.o
  LD [M]  /home/root/hellomod.ko
make[1]: Leaving directory '/lib/modules/4.14.19-yocto-standard/build'
root@qemux86-64:~# insmod hellomod.ko
[  109.391703] hellomod: loading out-of-tree module taints kernel.
[  109.402032] Hello world!

Bruce

Quoted 47 lines · Khem Raj

This contains getconf, getent and iconv glibc compat utils

Signed-off-by Khem Raj <[email protected]>
---
 meta/recipes-core/musl/musl-utils.bb | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 meta/recipes-core/musl/musl-utils.bb
meta/recipes-core/musl/musl-utils.bb new file +25 -1
new file mode 100644
index 0000000000..74b846df59
@@ -0,0 +1,25 @@
+# Copyright (C) 2018 Khem Raj <[email protected]>
+# Released under the MIT license (see COPYING.MIT for the terms)
+
+DESCRIPTION = "getconf, getent and iconv implementations for musl"
+HOMEPAGE = "https://git.alpinelinux.org/cgit/aports/tree/main/musl"
+LICENSE = "BSD-2-Clause & GPL-2.0+"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=9d08215e611db87b357e8674b4b42564"
+SECTION = "utils"
+
+# Date of the commit in SRCREV
+PV = "20170421"
+
+SRCREV = "fb5630138ccabbbc14a19d372096a04e42573c7d"
+SRC_URI = "git://github.com/boltlinux/musl-utils"
+
+inherit autotools
+
+S = "${WORKDIR}/git"
+
+PACKAGES =+ "${PN}-iconv"
+
+FILES_${PN}-iconv = "${bindir}/iconv"
+
+COMPATIBLE_HOST = ".*-musl.*"
+
--

2.16.2

--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Signature · 2 lines
"Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end"
author
#4 lore raw

PATCH 4/4 maintainers: Add myself for musl-utils

In reply to Khem Raj
Signed-off-by Khem Raj <[email protected]>
---
 meta/conf/distro/include/maintainers.inc | 1 +
 1 file changed, 1 insertion(+)
meta/conf/distro/include/maintainers.inc +1 -0
index 5039248790..027fb18d5e 100644
@@ -525,6 +525,7 @@ RECIPE_MAINTAINER_pn-mtd-utils = "Denys Dmytriyenko <[email protected]>"
 RECIPE_MAINTAINER_pn-mtdev = "Maxin B. John <[email protected]>"
 RECIPE_MAINTAINER_pn-mtools = "Maxin B. John <[email protected]>"
 RECIPE_MAINTAINER_pn-musl = "Khem Raj <[email protected]>"
+RECIPE_MAINTAINER_pn-musl-utils = "Khem Raj <[email protected]>"
 RECIPE_MAINTAINER_pn-mx-1.0 = "Maxin B. John <[email protected]>"
 RECIPE_MAINTAINER_pn-nasm = "Richard Purdie <[email protected]>"
 RECIPE_MAINTAINER_pn-nativesdk-buildtools-perl-dummy = "Richard Purdie <[email protected]>"
Signature · 1 line
2.16.2