mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-24 11:16:51 +00:00
Merge pull request #2862 from MilhouseVH/le90_glibc_2.28
glibc: update to glibc-2.28
This commit is contained in:
Christian Hewitt
GitHub
commit
3892b13f1b
@ -2,8 +2,8 @@
|
||||
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="stress-ng"
|
||||
PKG_VERSION="0.09.31"
|
||||
PKG_SHA256="a6e4287449b2694c4498a6b3836b911059392d263594ade1f6d224cb68b1c04c"
|
||||
PKG_VERSION="0.09.36"
|
||||
PKG_SHA256="16102abee20fe26b1a8784ab05c61b3e72474503bc50b9debc9f457cb4b4e228"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPLv2"
|
||||
PKG_SITE="http://kernel.ubuntu.com/~cking/stress-ng/"
|
||||
|
||||
@ -0,0 +1,44 @@
|
||||
From bf606ae577cd9142517a2170e14d4f9377a49deb Mon Sep 17 00:00:00 2001
|
||||
From: Colin Ian King <colin.king@canonical.com>
|
||||
Date: Sat, 4 Aug 2018 07:05:17 +0100
|
||||
Subject: stress-ng.h: rename statx_timestamp to shim_statx_timestamp
|
||||
|
||||
Newer versions of glibc now habe statx_timestamp defined, so
|
||||
rename this struct so it won't clash.
|
||||
|
||||
Signed-off-by: Colin Ian King <colin.king@canonical.com>
|
||||
---
|
||||
stress-ng.h | 10 +++++-----
|
||||
1 file changed, 5 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/stress-ng.h b/stress-ng.h
|
||||
index ae03a7b..b9359a4 100644
|
||||
--- a/stress-ng.h
|
||||
+++ b/stress-ng.h
|
||||
@@ -2932,7 +2932,7 @@ struct shim_sched_attr {
|
||||
#define SHIM_STATX_BTIME 0x00000800U
|
||||
#define SHIM_STATX_ALL 0x00000fffU
|
||||
|
||||
-struct statx_timestamp {
|
||||
+struct shim_statx_timestamp {
|
||||
int64_t tv_sec;
|
||||
int32_t tv_nsec;
|
||||
int32_t __reserved;
|
||||
@@ -2952,10 +2952,10 @@ struct shim_statx {
|
||||
uint64_t stx_size;
|
||||
uint64_t stx_blocks;
|
||||
uint64_t __spare1[1];
|
||||
- struct statx_timestamp stx_atime;
|
||||
- struct statx_timestamp stx_btime;
|
||||
- struct statx_timestamp stx_ctime;
|
||||
- struct statx_timestamp stx_mtime;
|
||||
+ struct shim_statx_timestamp stx_atime;
|
||||
+ struct shim_statx_timestamp stx_btime;
|
||||
+ struct shim_statx_timestamp stx_ctime;
|
||||
+ struct shim_statx_timestamp stx_mtime;
|
||||
uint32_t stx_rdev_major;
|
||||
uint32_t stx_rdev_minor;
|
||||
uint32_t stx_dev_major;
|
||||
--
|
||||
cgit v0.11.2
|
||||
|
||||
@ -0,0 +1,48 @@
|
||||
From 04322c0d653aec755517f771e6e400fc14cf611c Mon Sep 17 00:00:00 2001
|
||||
From: Colin Ian King <colin.king@canonical.com>
|
||||
Date: Sat, 4 Aug 2018 07:11:58 +0100
|
||||
Subject: stress-sysbadaddr: only use ustat if HAVE_USTAT is defined
|
||||
|
||||
We should be using HAVE_USTAT as ustat.h is not available on
|
||||
newer versions of glibc and HAVE_USTAT is undefined if this
|
||||
is not available.
|
||||
|
||||
Signed-off-by: Colin Ian King <colin.king@canonical.com>
|
||||
---
|
||||
stress-sysbadaddr.c | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/stress-sysbadaddr.c b/stress-sysbadaddr.c
|
||||
index eab9213..0b6465f 100644
|
||||
--- a/stress-sysbadaddr.c
|
||||
+++ b/stress-sysbadaddr.c
|
||||
@@ -28,7 +28,7 @@
|
||||
#include <sys/sysinfo.h>
|
||||
#include <utime.h>
|
||||
#include <sys/vfs.h>
|
||||
-#if defined(__NR_ustat)
|
||||
+#if defined(HAVE_USTAT)
|
||||
#include <ustat.h>
|
||||
#endif
|
||||
#endif
|
||||
@@ -379,7 +379,7 @@ static int bad_times(void *addr)
|
||||
return times(addr);
|
||||
}
|
||||
|
||||
-#if defined(__linux__) && defined(__NR_ustat)
|
||||
+#if defined(HAVE_USTAT)
|
||||
static int bad_ustat(void *addr)
|
||||
{
|
||||
dev_t dev = { 0 };
|
||||
@@ -495,7 +495,7 @@ static bad_syscall_t bad_syscalls[] = {
|
||||
bad_timer_create,
|
||||
#endif
|
||||
bad_times,
|
||||
-#if defined(__linux__) && defined(__NR_ustat)
|
||||
+#if defined(HAVE_USTAT)
|
||||
bad_ustat,
|
||||
#endif
|
||||
#if defined(__linux__)
|
||||
--
|
||||
cgit v0.11.2
|
||||
|
||||
@ -3,8 +3,8 @@
|
||||
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="glibc"
|
||||
PKG_VERSION="2.27"
|
||||
PKG_SHA256="5172de54318ec0b7f2735e5a91d908afe1c9ca291fec16b5374d9faadfc1fc72"
|
||||
PKG_VERSION="2.28"
|
||||
PKG_SHA256="b1900051afad76f7a4f73e71413df4826dce085ef8ddb785a945b66d7d513082"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://www.gnu.org/software/libc/"
|
||||
|
||||
@ -9,7 +9,7 @@ PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://libcec.pulse-eight.com/"
|
||||
PKG_URL="https://github.com/Pulse-Eight/libcec/archive/$PKG_VERSION.tar.gz"
|
||||
PKG_DEPENDS_TARGET="toolchain systemd lockdev p8-platform swig:host"
|
||||
PKG_DEPENDS_TARGET="toolchain systemd p8-platform swig:host"
|
||||
PKG_SECTION="system"
|
||||
PKG_SHORTDESC="libCEC is an open-source dual licensed library designed for communicating with the Pulse-Eight USB - CEC Adaptor"
|
||||
PKG_LONGDESC="libCEC is an open-source dual licensed library designed for communicating with the Pulse-Eight USB - CEC Adaptor."
|
||||
|
||||
@ -1,22 +0,0 @@
|
||||
# SPDX-License-Identifier: GPL-2.0-or-later
|
||||
# Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
|
||||
|
||||
PKG_NAME="lockdev"
|
||||
PKG_VERSION="16b8996"
|
||||
PKG_SHA256="49900093c12099047afa9f9d341da07b1a4a719e35c43db8409f65555ce09eb4"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="https://alioth.debian.org/scm/?group_id=100443"
|
||||
PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
|
||||
PKG_DEPENDS_TARGET="toolchain"
|
||||
PKG_SECTION="system"
|
||||
PKG_SHORTDESC="lockdev: Manage character and block device lockfiles."
|
||||
PKG_LONGDESC="lockdev manages character and block device lockfiles."
|
||||
PKG_TOOLCHAIN="autotools"
|
||||
PKG_BUILD_FLAGS="+pic"
|
||||
|
||||
PKG_CONFIGURE_OPTS_TARGET="--enable-static --disable-shared"
|
||||
|
||||
post_makeinstall_target() {
|
||||
rm -rf $INSTALL/usr
|
||||
}
|
||||
@ -0,0 +1,29 @@
|
||||
From b79bdebf285575ec2c3e8944d951655ef8c97a23 Mon Sep 17 00:00:00 2001
|
||||
From: Mike Frysinger <vapier at gentoo.org>
|
||||
Date: Tue, 21 Jun 2016 15:01:08 -0400
|
||||
Subject: [PATCH] include sysmacros.h for major/minor/makedev
|
||||
|
||||
Linux C libs are moving away from including this header implicitly via
|
||||
sys/types.h, so include it explicitly.
|
||||
|
||||
Upstream-Status: Pending
|
||||
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
|
||||
---
|
||||
libparted/arch/linux.c | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/libparted/arch/linux.c b/libparted/arch/linux.c
|
||||
index 0f18904..b302d63 100644
|
||||
--- a/libparted/arch/linux.c
|
||||
+++ b/libparted/arch/linux.c
|
||||
@@ -37,6 +37,7 @@
|
||||
#include <dirent.h>
|
||||
#include <sys/ioctl.h>
|
||||
#include <sys/stat.h>
|
||||
+#include <sys/sysmacros.h>
|
||||
#include <sys/types.h>
|
||||
#include <sys/utsname.h> /* for uname() */
|
||||
#include <scsi/scsi.h>
|
||||
--
|
||||
2.14.1
|
||||
|
||||
@ -1,11 +1,12 @@
|
||||
# SPDX-License-Identifier: GPL-2.0-or-later
|
||||
# Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
|
||||
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="systemd"
|
||||
PKG_VERSION="239"
|
||||
PKG_SHA256="8a11b1b07d620f4c06a16e95bba4dd2a97e90efdf2a5ba47ed0a935085787a14"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_LICENSE="LGPL2.1+"
|
||||
PKG_SITE="http://www.freedesktop.org/wiki/Software/systemd"
|
||||
PKG_URL="https://github.com/systemd/systemd/archive/v$PKG_VERSION.tar.gz"
|
||||
PKG_DEPENDS_TARGET="toolchain libcap kmod util-linux entropy"
|
||||
|
||||
@ -0,0 +1,105 @@
|
||||
From 75720bff62a84896e9a0654afc7cf9408cf89a38 Mon Sep 17 00:00:00 2001
|
||||
From: Filipe Brandenburger <filbranden@google.com>
|
||||
Date: Sun, 15 Jul 2018 22:43:35 -0700
|
||||
Subject: [PATCH] build-sys: Detect whether struct statx is defined in
|
||||
sys/stat.h
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Starting with glibc 2.27.9000-36.fc29, include file sys/stat.h will have a
|
||||
definition for struct statx, in which case include file linux/stat.h should be
|
||||
avoided, in order to prevent a duplicate definition.
|
||||
|
||||
In file included from ../src/basic/missing.h:18,
|
||||
from ../src/basic/util.h:28,
|
||||
from ../src/basic/hashmap.h:10,
|
||||
from ../src/shared/bus-util.h:12,
|
||||
from ../src/libsystemd/sd-bus/bus-creds.c:11:
|
||||
/usr/include/linux/stat.h:99:8: error: redefinition of ‘struct statx’
|
||||
struct statx {
|
||||
^~~~~
|
||||
In file included from /usr/include/sys/stat.h:446,
|
||||
from ../src/basic/util.h:19,
|
||||
from ../src/basic/hashmap.h:10,
|
||||
from ../src/shared/bus-util.h:12,
|
||||
from ../src/libsystemd/sd-bus/bus-creds.c:11:
|
||||
/usr/include/bits/statx.h:36:8: note: originally defined here
|
||||
struct statx
|
||||
^~~~~
|
||||
|
||||
Extend our meson.build to look for struct statx when only sys/stat.h is
|
||||
included and, in that case, do not include linux/stat.h anymore.
|
||||
|
||||
Tested that systemd builds correctly when using a glibc version that includes a
|
||||
definition for struct statx.
|
||||
|
||||
glibc Fedora RPM update:
|
||||
https://src.fedoraproject.org/rpms/glibc/c/28cb5d31fc1e5887912283c889689c47076278ae
|
||||
|
||||
glibc upstream commit:
|
||||
https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=fd70af45528d59a00eb3190ef6706cb299488fcd
|
||||
---
|
||||
meson.build | 5 +++++
|
||||
src/basic/missing.h | 5 ++++-
|
||||
src/basic/xattr-util.c | 1 -
|
||||
3 files changed, 9 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/meson.build b/meson.build
|
||||
index dd904c71487..68423bdfa5e 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -425,6 +425,7 @@ decl_headers = '''
|
||||
#include <sys/stat.h>
|
||||
'''
|
||||
# FIXME: key_serial_t is only defined in keyutils.h, this is bound to fail
|
||||
+# FIXME: these should use -D_GNU_SOURCE, since that is defined at build time
|
||||
|
||||
foreach decl : ['char16_t',
|
||||
'char32_t',
|
||||
@@ -439,6 +440,10 @@ foreach decl : ['char16_t',
|
||||
conf.set10('HAVE_' + decl.underscorify().to_upper(), have)
|
||||
endforeach
|
||||
|
||||
+conf.set10('HAVE_STRUCT_STATX_IN_SYS_STAT_H', cc.sizeof('struct statx', prefix : '''
|
||||
+#include <sys/stat.h>
|
||||
+''', args : '-D_GNU_SOURCE') > 0)
|
||||
+
|
||||
foreach decl : [['IFLA_INET6_ADDR_GEN_MODE', 'linux/if_link.h'],
|
||||
['IN6_ADDR_GEN_MODE_STABLE_PRIVACY', 'linux/if_link.h'],
|
||||
['IFLA_VRF_TABLE', 'linux/if_link.h'],
|
||||
diff --git a/src/basic/missing.h b/src/basic/missing.h
|
||||
index 71a07d05747..14ad3d49140 100644
|
||||
--- a/src/basic/missing.h
|
||||
+++ b/src/basic/missing.h
|
||||
@@ -15,7 +15,6 @@
|
||||
#include <linux/neighbour.h>
|
||||
#include <linux/oom.h>
|
||||
#include <linux/rtnetlink.h>
|
||||
-#include <linux/stat.h>
|
||||
#include <net/ethernet.h>
|
||||
#include <stdlib.h>
|
||||
#include <sys/resource.h>
|
||||
@@ -25,6 +24,10 @@
|
||||
#include <uchar.h>
|
||||
#include <unistd.h>
|
||||
|
||||
+#if !HAVE_STRUCT_STATX_IN_SYS_STAT_H
|
||||
+#include <linux/stat.h>
|
||||
+#endif
|
||||
+
|
||||
#if HAVE_AUDIT
|
||||
#include <libaudit.h>
|
||||
#endif
|
||||
diff --git a/src/basic/xattr-util.c b/src/basic/xattr-util.c
|
||||
index c5c55ea8461..0ee0979837c 100644
|
||||
--- a/src/basic/xattr-util.c
|
||||
+++ b/src/basic/xattr-util.c
|
||||
@@ -2,7 +2,6 @@
|
||||
|
||||
#include <errno.h>
|
||||
#include <fcntl.h>
|
||||
-#include <linux/stat.h>
|
||||
#include <stdint.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
@ -1,11 +1,12 @@
|
||||
# SPDX-License-Identifier: GPL-2.0-or-later
|
||||
# Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
|
||||
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
# with 1.0.0 repeat delay is broken. test on upgrade
|
||||
|
||||
PKG_NAME="v4l-utils"
|
||||
PKG_VERSION="1.14.1"
|
||||
PKG_SHA256="7974e5626447407d8a1ed531da0461c0fe00e599a696cb548a240d17d3519005"
|
||||
PKG_VERSION="1.14.2"
|
||||
PKG_SHA256="e6b962c4b1253cf852c31da13fd6b5bb7cbe5aa9e182881aec55123bae680692"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://linuxtv.org/"
|
||||
|
||||
@ -0,0 +1,37 @@
|
||||
From a46598389950a9764399667c7d30f318c95ffd0a Mon Sep 17 00:00:00 2001
|
||||
From: MilhouseVH <milhouseVH.github@nmacleod.com>
|
||||
Date: Wed, 1 Aug 2018 23:21:24 +0100
|
||||
Subject: [PATCH] fix build with glibc-2.28
|
||||
|
||||
---
|
||||
lib/libv4lconvert/control/libv4lcontrol.c | 1 +
|
||||
utils/v4l2-ctl/v4l2-ctl.cpp | 1 +
|
||||
2 files changed, 2 insertions(+)
|
||||
|
||||
diff --git a/lib/libv4lconvert/control/libv4lcontrol.c b/lib/libv4lconvert/control/libv4lcontrol.c
|
||||
index 1e784ed..1252847 100644
|
||||
--- a/lib/libv4lconvert/control/libv4lcontrol.c
|
||||
+++ b/lib/libv4lconvert/control/libv4lcontrol.c
|
||||
@@ -26,6 +26,7 @@
|
||||
#include <sys/mman.h>
|
||||
#include <fcntl.h>
|
||||
#include <sys/stat.h>
|
||||
+#include <sys/sysmacros.h>
|
||||
#include <ctype.h>
|
||||
#include <errno.h>
|
||||
#include <fnmatch.h>
|
||||
diff --git a/utils/v4l2-ctl/v4l2-ctl.cpp b/utils/v4l2-ctl/v4l2-ctl.cpp
|
||||
index e02dc75..287114b 100644
|
||||
--- a/utils/v4l2-ctl/v4l2-ctl.cpp
|
||||
+++ b/utils/v4l2-ctl/v4l2-ctl.cpp
|
||||
@@ -28,6 +28,7 @@
|
||||
#include <getopt.h>
|
||||
#include <sys/types.h>
|
||||
#include <sys/stat.h>
|
||||
+#include <sys/sysmacros.h>
|
||||
#include <fcntl.h>
|
||||
#include <ctype.h>
|
||||
#include <errno.h>
|
||||
--
|
||||
2.14.1
|
||||
|
||||
@ -1,9 +1,10 @@
|
||||
# SPDX-License-Identifier: GPL-2.0-or-later
|
||||
# Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
|
||||
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="hdparm"
|
||||
PKG_VERSION="9.52"
|
||||
PKG_SHA256="c3429cd423e271fa565bf584598fd751dd2e773bb7199a592b06b5a61cec4fb6"
|
||||
PKG_VERSION="9.56"
|
||||
PKG_SHA256="6ff9ed695f1017396eec4101f990f114b7b0e0a04c5aa6369c0394053d16e4da"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="BSD"
|
||||
PKG_SITE="http://sourceforge.net/projects/hdparm/"
|
||||
|
||||
@ -0,0 +1,33 @@
|
||||
From 1a74985b2a404639b08882c57f3147229605dfd5 Mon Sep 17 00:00:00 2001
|
||||
From: Mike Frysinger <vapier@gentoo.org>
|
||||
Date: Tue, 19 Apr 2016 06:50:31 -0400
|
||||
Subject: [PATCH] extlinux: pull in sys/sysmacros.h for major/minor/makedev
|
||||
|
||||
These functions are defined in sys/sysmacros.h, so add the include to
|
||||
main.c. This is already handled correctly in mountinfo.c. Otherwise
|
||||
we get build failures like:
|
||||
|
||||
main.o: In function 'find_device_sysfs':
|
||||
extlinux/main.c:1131: undefined reference to 'minor'
|
||||
|
||||
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
|
||||
Signed-off-by: Gene Cumm <gene.cumm@gmail.com>
|
||||
---
|
||||
extlinux/main.c | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/extlinux/main.c b/extlinux/main.c
|
||||
index a7ebd49..ebff7ea 100644
|
||||
--- a/extlinux/main.c
|
||||
+++ b/extlinux/main.c
|
||||
@@ -38,6 +38,7 @@
|
||||
#include <sysexits.h>
|
||||
#include <sys/ioctl.h>
|
||||
#include <sys/stat.h>
|
||||
+#include <sys/sysmacros.h>
|
||||
#include <sys/types.h>
|
||||
#include <sys/mount.h>
|
||||
#include <sys/vfs.h>
|
||||
--
|
||||
2.10.5.GIT
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user