diff options
| author | Andrew Geissler <geissonator@yahoo.com> | 2021-02-13 00:55:30 +0300 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2021-02-25 23:15:06 +0300 |
| commit | 706d5aacd7ab7b37c00df1a1b210e4ced06119e1 (patch) | |
| tree | ed0bec373424d01accfb2e9c895c177a3e2d7abe /poky/meta/recipes-core/musl | |
| parent | ac970dd705934286df062e0f1501f776dc2ef01d (diff) | |
| download | openbmc-706d5aacd7ab7b37c00df1a1b210e4ced06119e1.tar.xz | |
Reset poky to before our libpam hacks
Things got a bit out of synch with openbmc-config due to the libpam
issues and the migration from the meta-* layers.
Revert the two previous commits and then put the latest poky in with the
libpam revert and get openbmc-config right again.
Revert "Revert "libpam: update 1.3.1 -> 1.5.1""
This reverts commit 87ddd3eab4df68e624b5350ccaab28b3b97547c0.
Revert "poky: subtree update:796be0593a..10c69538c0"
This reverts commit c723b72979bfac6362509cf1fe086900f6641f28.
Change-Id: I3a1f405193aee6a21fe0cd24be9927c143a23d9a
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Diffstat (limited to 'poky/meta/recipes-core/musl')
3 files changed, 64 insertions, 5 deletions
diff --git a/poky/meta/recipes-core/musl/musl/0001-crt-Add-.file-directive.patch b/poky/meta/recipes-core/musl/musl/0001-crt-Add-.file-directive.patch index 35c8b6574..d2bd587e3 100644 --- a/poky/meta/recipes-core/musl/musl/0001-crt-Add-.file-directive.patch +++ b/poky/meta/recipes-core/musl/musl/0001-crt-Add-.file-directive.patch @@ -43,6 +43,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> crt/x86_64/crtn.s | 1 + 28 files changed, 28 insertions(+) +diff --git a/crt/aarch64/crti.s b/crt/aarch64/crti.s +index 775df0ac..0f7c23a9 100644 --- a/crt/aarch64/crti.s +++ b/crt/aarch64/crti.s @@ -1,3 +1,4 @@ @@ -50,6 +52,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> .section .init .global _init .type _init,%function +diff --git a/crt/aarch64/crtn.s b/crt/aarch64/crtn.s +index 73cab692..d62fc129 100644 --- a/crt/aarch64/crtn.s +++ b/crt/aarch64/crtn.s @@ -1,3 +1,4 @@ @@ -57,6 +61,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> .section .init ldp x29,x30,[sp],#16 ret +diff --git a/crt/arm/crti.s b/crt/arm/crti.s +index 18dc1e41..8df72979 100644 --- a/crt/arm/crti.s +++ b/crt/arm/crti.s @@ -1,3 +1,4 @@ @@ -64,6 +70,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> .syntax unified .section .init +diff --git a/crt/arm/crtn.s b/crt/arm/crtn.s +index dc020f92..7451355b 100644 --- a/crt/arm/crtn.s +++ b/crt/arm/crtn.s @@ -1,3 +1,4 @@ @@ -71,6 +79,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> .syntax unified .section .init +diff --git a/crt/i386/crti.s b/crt/i386/crti.s +index d2682a20..2823fc3b 100644 --- a/crt/i386/crti.s +++ b/crt/i386/crti.s @@ -1,3 +1,4 @@ @@ -78,6 +88,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> .section .init .global _init _init: +diff --git a/crt/i386/crtn.s b/crt/i386/crtn.s +index f3b61e01..04fb1646 100644 --- a/crt/i386/crtn.s +++ b/crt/i386/crtn.s @@ -1,3 +1,4 @@ @@ -85,6 +97,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> .section .init add $12,%esp ret +diff --git a/crt/microblaze/crti.s b/crt/microblaze/crti.s +index ed1c2fa4..29ee4733 100644 --- a/crt/microblaze/crti.s +++ b/crt/microblaze/crti.s @@ -1,3 +1,4 @@ @@ -92,6 +106,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> .section .init .global _init .align 2 +diff --git a/crt/microblaze/crtn.s b/crt/microblaze/crtn.s +index 1e02c984..c2083749 100644 --- a/crt/microblaze/crtn.s +++ b/crt/microblaze/crtn.s @@ -1,3 +1,4 @@ @@ -99,6 +115,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> .section .init lwi r15, r1, 0 rtsd r15, 8 +diff --git a/crt/mips/crti.s b/crt/mips/crti.s +index 39dee380..0211764e 100644 --- a/crt/mips/crti.s +++ b/crt/mips/crti.s @@ -1,3 +1,4 @@ @@ -106,6 +124,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> .set noreorder .section .init +diff --git a/crt/mips/crtn.s b/crt/mips/crtn.s +index 506a04b7..606490cf 100644 --- a/crt/mips/crtn.s +++ b/crt/mips/crtn.s @@ -1,3 +1,4 @@ @@ -113,6 +133,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> .set noreorder .section .init +diff --git a/crt/mips64/crti.s b/crt/mips64/crti.s +index c962dd09..f2c19cdd 100644 --- a/crt/mips64/crti.s +++ b/crt/mips64/crti.s @@ -1,3 +1,4 @@ @@ -120,6 +142,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> .set noreorder .section .init +diff --git a/crt/mips64/crtn.s b/crt/mips64/crtn.s +index f3930b24..68903ffa 100644 --- a/crt/mips64/crtn.s +++ b/crt/mips64/crtn.s @@ -1,3 +1,4 @@ @@ -127,6 +151,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> .set noreorder .section .init +diff --git a/crt/mipsn32/crti.s b/crt/mipsn32/crti.s +index 14fa28d9..a35387d3 100644 --- a/crt/mipsn32/crti.s +++ b/crt/mipsn32/crti.s @@ -1,3 +1,4 @@ @@ -134,6 +160,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> .set noreorder .section .init .global _init +diff --git a/crt/mipsn32/crtn.s b/crt/mipsn32/crtn.s +index dccd7e89..bdb6e561 100644 --- a/crt/mipsn32/crtn.s +++ b/crt/mipsn32/crtn.s @@ -1,3 +1,4 @@ @@ -141,6 +169,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> .set noreorder .section .init ld $gp, 16($sp) +diff --git a/crt/or1k/crti.s b/crt/or1k/crti.s +index 7e741459..919369ca 100644 --- a/crt/or1k/crti.s +++ b/crt/or1k/crti.s @@ -1,3 +1,4 @@ @@ -148,6 +178,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> .section .init .global _init _init: +diff --git a/crt/or1k/crtn.s b/crt/or1k/crtn.s +index 4185a027..d670b327 100644 --- a/crt/or1k/crtn.s +++ b/crt/or1k/crtn.s @@ -1,3 +1,4 @@ @@ -155,6 +187,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> .section .init l.lwz r9,0(r1) l.jr r9 +diff --git a/crt/powerpc/crti.s b/crt/powerpc/crti.s +index 60461ca4..b748ca48 100644 --- a/crt/powerpc/crti.s +++ b/crt/powerpc/crti.s @@ -1,3 +1,4 @@ @@ -162,6 +196,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> .section .init .align 2 .global _init +diff --git a/crt/powerpc/crtn.s b/crt/powerpc/crtn.s +index 2d14a6f0..d989e36f 100644 --- a/crt/powerpc/crtn.s +++ b/crt/powerpc/crtn.s @@ -1,3 +1,4 @@ @@ -169,6 +205,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> .section .init .align 2 lwz 0,36(1) +diff --git a/crt/powerpc64/crti.s b/crt/powerpc64/crti.s +index 9f712f0e..d3323a67 100644 --- a/crt/powerpc64/crti.s +++ b/crt/powerpc64/crti.s @@ -1,3 +1,4 @@ @@ -176,6 +214,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> .section .init .align 2 .global _init +diff --git a/crt/powerpc64/crtn.s b/crt/powerpc64/crtn.s +index a7a9f4a0..5e71ae66 100644 --- a/crt/powerpc64/crtn.s +++ b/crt/powerpc64/crtn.s @@ -1,3 +1,4 @@ @@ -183,6 +223,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> .section .init .align 2 addi 1, 1, 32 +diff --git a/crt/s390x/crti.s b/crt/s390x/crti.s +index f453205b..3da3c5e1 100644 --- a/crt/s390x/crti.s +++ b/crt/s390x/crti.s @@ -1,3 +1,4 @@ @@ -190,6 +232,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> .section .init .align 2 .global _init +diff --git a/crt/s390x/crtn.s b/crt/s390x/crtn.s +index 06066dc9..bfd55caf 100644 --- a/crt/s390x/crtn.s +++ b/crt/s390x/crtn.s @@ -1,3 +1,4 @@ @@ -197,6 +241,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> .section .init .align 2 lmg %r14, %r15, 272(%r15) +diff --git a/crt/sh/crti.s b/crt/sh/crti.s +index d99bfd5c..77d61c51 100644 --- a/crt/sh/crti.s +++ b/crt/sh/crti.s @@ -1,3 +1,4 @@ @@ -204,6 +250,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> .section .init .global _init .type _init, @function +diff --git a/crt/sh/crtn.s b/crt/sh/crtn.s +index 958ce951..29deb5be 100644 --- a/crt/sh/crtn.s +++ b/crt/sh/crtn.s @@ -1,3 +1,4 @@ @@ -211,6 +259,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> .section .init lds.l @r15+, pr mov.l @r15+, r14 +diff --git a/crt/x32/crti.s b/crt/x32/crti.s +index 4788968b..8668b7c7 100644 --- a/crt/x32/crti.s +++ b/crt/x32/crti.s @@ -1,3 +1,4 @@ @@ -218,6 +268,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> .section .init .global _init _init: +diff --git a/crt/x32/crtn.s b/crt/x32/crtn.s +index 29198b77..ef73d295 100644 --- a/crt/x32/crtn.s +++ b/crt/x32/crtn.s @@ -1,3 +1,4 @@ @@ -225,6 +277,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> .section .init pop %rax ret +diff --git a/crt/x86_64/crti.s b/crt/x86_64/crti.s +index 4788968b..8668b7c7 100644 --- a/crt/x86_64/crti.s +++ b/crt/x86_64/crti.s @@ -1,3 +1,4 @@ @@ -232,6 +286,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> .section .init .global _init _init: +diff --git a/crt/x86_64/crtn.s b/crt/x86_64/crtn.s +index 29198b77..ef73d295 100644 --- a/crt/x86_64/crtn.s +++ b/crt/x86_64/crtn.s @@ -1,3 +1,4 @@ @@ -239,3 +295,6 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> .section .init pop %rax ret +-- +2.29.1 + diff --git a/poky/meta/recipes-core/musl/musl/0002-ldso-Use-syslibdir-and-libdir-as-default-pathes-to-l.patch b/poky/meta/recipes-core/musl/musl/0002-ldso-Use-syslibdir-and-libdir-as-default-pathes-to-l.patch index 0aeb5eb5c..f57aae5f3 100644 --- a/poky/meta/recipes-core/musl/musl/0002-ldso-Use-syslibdir-and-libdir-as-default-pathes-to-l.patch +++ b/poky/meta/recipes-core/musl/musl/0002-ldso-Use-syslibdir-and-libdir-as-default-pathes-to-l.patch @@ -34,16 +34,16 @@ Signed-off-by: Serhey Popovych <serhe.popovych@gmail.com> LDFLAGS_ALL = $(LDFLAGS_AUTO) $(LDFLAGS) --- a/ldso/dynlink.c +++ b/ldso/dynlink.c -@@ -29,6 +29,8 @@ - #define realloc __libc_realloc - #define free __libc_free +@@ -24,6 +24,8 @@ + #include "libc.h" + #include "dynlink.h" +#define SYS_PATH_DFLT SYSLIBDIR ":" LIBDIR + static void error(const char *, ...); #define MAXP2(a,b) (-(-(a)&-(b))) -@@ -1094,7 +1096,7 @@ static struct dso *load_library(const ch +@@ -1071,7 +1073,7 @@ static struct dso *load_library(const ch sys_path = ""; } } diff --git a/poky/meta/recipes-core/musl/musl_git.bb b/poky/meta/recipes-core/musl/musl_git.bb index d4e75f918..23c2072ea 100644 --- a/poky/meta/recipes-core/musl/musl_git.bb +++ b/poky/meta/recipes-core/musl/musl_git.bb @@ -4,7 +4,7 @@ require musl.inc inherit linuxloader -SRCREV = "1e4204d522670a1d8b8ab85f1cfefa960547e8af" +SRCREV = "d91a6cf6e369a79587c5665fce9635e5634ca201" BASEVER = "1.2.1" |