Skip to content

Commit 972870e

Browse files
tklausergopherbot
authored andcommitted
unix/linux: update to Linux kernel 6.2, glibc 2.37 and Go 1.20.1
Also remove some manually defined AT_* contstants which are now defined in the libc headers. Change-Id: I342976a22948e9b05e38dc7503d9dd356cee6c7b Reviewed-on: https://go-review.googlesource.com/c/sys/+/470176 Reviewed-by: Ian Lance Taylor <[email protected]> Run-TryBot: Tobias Klauser <[email protected]> Auto-Submit: Tobias Klauser <[email protected]> TryBot-Result: Gopher Robot <[email protected]> Reviewed-by: Than McIntosh <[email protected]>
1 parent cc0b67d commit 972870e

File tree

4 files changed

+45
-36
lines changed

4 files changed

+45
-36
lines changed

unix/linux/Dockerfile

+6-6
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
1515
# Get the git sources. If not cached, this takes O(5 minutes).
1616
WORKDIR /git
1717
RUN git config --global advice.detachedHead false
18-
# Linux Kernel: Released 11 Dec 2022
19-
RUN git clone --branch v6.1 --depth 1 https://kernel.googlesource.com/pub/scm/linux/kernel/git/torvalds/linux
20-
# GNU C library: Released 30 Jul 2022
21-
RUN git clone --branch release/2.36/master --depth 1 https://sourceware.org/git/glibc.git
18+
# Linux Kernel: Released 19 Feb 2023
19+
RUN git clone --branch v6.2 --depth 1 https://kernel.googlesource.com/pub/scm/linux/kernel/git/torvalds/linux
20+
# GNU C library: Released 1 Feb 2022
21+
RUN git clone --branch release/2.37/master --depth 1 https://sourceware.org/git/glibc.git
2222

2323
# Get Go
24-
ENV GOLANG_VERSION 1.20rc2
24+
ENV GOLANG_VERSION 1.20.1
2525
ENV GOLANG_DOWNLOAD_URL https://golang.org/dl/go$GOLANG_VERSION.linux-amd64.tar.gz
26-
ENV GOLANG_DOWNLOAD_SHA256 9ba01a3be1a682b89f5bfc62f9fba0e7d6990a5b7018f6c7aaa56ad65ed96a0e
26+
ENV GOLANG_DOWNLOAD_SHA256 000a5b1fca4f75895f78befeb2eecf10bfff3c428597f3f1e69133b63b911b02
2727

2828
RUN curl -fsSL "$GOLANG_DOWNLOAD_URL" -o golang.tar.gz \
2929
&& echo "$GOLANG_DOWNLOAD_SHA256 golang.tar.gz" | sha256sum -c - \

unix/linux/types.go

+11-19
Original file line numberDiff line numberDiff line change
@@ -192,25 +192,6 @@ typedef struct {
192192
typedef struct stat my_stat;
193193
#endif
194194
195-
// These are defined in linux/fcntl.h, but including it globally causes
196-
// conflicts with fcntl.h
197-
#ifndef AT_STATX_SYNC_TYPE
198-
# define AT_STATX_SYNC_TYPE 0x6000 // Type of synchronisation required from statx()
199-
#endif
200-
#ifndef AT_STATX_SYNC_AS_STAT
201-
# define AT_STATX_SYNC_AS_STAT 0x0000 // - Do whatever stat() does
202-
#endif
203-
#ifndef AT_STATX_FORCE_SYNC
204-
# define AT_STATX_FORCE_SYNC 0x2000 // - Force the attributes to be sync'd with the server
205-
#endif
206-
#ifndef AT_STATX_DONT_SYNC
207-
# define AT_STATX_DONT_SYNC 0x4000 // - Don't sync attributes with the server
208-
#endif
209-
210-
#ifndef AT_EACCESS
211-
# define AT_EACCESS 0x200 // Test access permitted for effective IDs, not real IDs.
212-
#endif
213-
214195
#ifdef TCSETS2
215196
// On systems that have "struct termios2" use this as type Termios.
216197
typedef struct termios2 termios_t;
@@ -1963,6 +1944,10 @@ const (
19631944
NFT_MSG_GETOBJ = C.NFT_MSG_GETOBJ
19641945
NFT_MSG_DELOBJ = C.NFT_MSG_DELOBJ
19651946
NFT_MSG_GETOBJ_RESET = C.NFT_MSG_GETOBJ_RESET
1947+
NFT_MSG_NEWFLOWTABLE = C.NFT_MSG_NEWFLOWTABLE
1948+
NFT_MSG_GETFLOWTABLE = C.NFT_MSG_GETFLOWTABLE
1949+
NFT_MSG_DELFLOWTABLE = C.NFT_MSG_DELFLOWTABLE
1950+
NFT_MSG_GETRULE_RESET = C.NFT_MSG_GETRULE_RESET
19661951
NFT_MSG_MAX = C.NFT_MSG_MAX
19671952
NFTA_LIST_UNSPEC = C.NFTA_LIST_UNSPEC
19681953
NFTA_LIST_ELEM = C.NFTA_LIST_ELEM
@@ -2446,6 +2431,8 @@ const (
24462431
SOF_TIMESTAMPING_OPT_STATS = C.SOF_TIMESTAMPING_OPT_STATS
24472432
SOF_TIMESTAMPING_OPT_PKTINFO = C.SOF_TIMESTAMPING_OPT_PKTINFO
24482433
SOF_TIMESTAMPING_OPT_TX_SWHW = C.SOF_TIMESTAMPING_OPT_TX_SWHW
2434+
SOF_TIMESTAMPING_BIND_PHC = C.SOF_TIMESTAMPING_BIND_PHC
2435+
SOF_TIMESTAMPING_OPT_ID_TCP = C.SOF_TIMESTAMPING_OPT_ID_TCP
24492436

24502437
SOF_TIMESTAMPING_LAST = C.SOF_TIMESTAMPING_LAST
24512438
SOF_TIMESTAMPING_MASK = C.SOF_TIMESTAMPING_MASK
@@ -3285,6 +3272,7 @@ const (
32853272
DEVLINK_PORT_FUNCTION_ATTR_HW_ADDR = C.DEVLINK_PORT_FUNCTION_ATTR_HW_ADDR
32863273
DEVLINK_PORT_FN_ATTR_STATE = C.DEVLINK_PORT_FN_ATTR_STATE
32873274
DEVLINK_PORT_FN_ATTR_OPSTATE = C.DEVLINK_PORT_FN_ATTR_OPSTATE
3275+
DEVLINK_PORT_FN_ATTR_CAPS = C.DEVLINK_PORT_FN_ATTR_CAPS
32883276
DEVLINK_PORT_FUNCTION_ATTR_MAX = C.DEVLINK_PORT_FUNCTION_ATTR_MAX
32893277
)
32903278

@@ -3564,6 +3552,7 @@ const (
35643552
ETHTOOL_MSG_MODULE_SET = C.ETHTOOL_MSG_MODULE_SET
35653553
ETHTOOL_MSG_PSE_GET = C.ETHTOOL_MSG_PSE_GET
35663554
ETHTOOL_MSG_PSE_SET = C.ETHTOOL_MSG_PSE_SET
3555+
ETHTOOL_MSG_RSS_GET = C.ETHTOOL_MSG_RSS_GET
35673556
ETHTOOL_MSG_USER_MAX = C.ETHTOOL_MSG_USER_MAX
35683557
ETHTOOL_MSG_KERNEL_NONE = C.ETHTOOL_MSG_KERNEL_NONE
35693558
ETHTOOL_MSG_STRSET_GET_REPLY = C.ETHTOOL_MSG_STRSET_GET_REPLY
@@ -3603,6 +3592,7 @@ const (
36033592
ETHTOOL_MSG_MODULE_GET_REPLY = C.ETHTOOL_MSG_MODULE_GET_REPLY
36043593
ETHTOOL_MSG_MODULE_NTF = C.ETHTOOL_MSG_MODULE_NTF
36053594
ETHTOOL_MSG_PSE_GET_REPLY = C.ETHTOOL_MSG_PSE_GET_REPLY
3595+
ETHTOOL_MSG_RSS_GET_REPLY = C.ETHTOOL_MSG_RSS_GET_REPLY
36063596
ETHTOOL_MSG_KERNEL_MAX = C.ETHTOOL_MSG_KERNEL_MAX
36073597
ETHTOOL_A_HEADER_UNSPEC = C.ETHTOOL_A_HEADER_UNSPEC
36083598
ETHTOOL_A_HEADER_DEV_INDEX = C.ETHTOOL_A_HEADER_DEV_INDEX
@@ -3671,6 +3661,7 @@ const (
36713661
ETHTOOL_A_LINKSTATE_SQI_MAX = C.ETHTOOL_A_LINKSTATE_SQI_MAX
36723662
ETHTOOL_A_LINKSTATE_EXT_STATE = C.ETHTOOL_A_LINKSTATE_EXT_STATE
36733663
ETHTOOL_A_LINKSTATE_EXT_SUBSTATE = C.ETHTOOL_A_LINKSTATE_EXT_SUBSTATE
3664+
ETHTOOL_A_LINKSTATE_EXT_DOWN_CNT = C.ETHTOOL_A_LINKSTATE_EXT_DOWN_CNT
36743665
ETHTOOL_A_LINKSTATE_MAX = C.ETHTOOL_A_LINKSTATE_MAX
36753666
ETHTOOL_A_DEBUG_UNSPEC = C.ETHTOOL_A_DEBUG_UNSPEC
36763667
ETHTOOL_A_DEBUG_HEADER = C.ETHTOOL_A_DEBUG_HEADER
@@ -4464,6 +4455,7 @@ const (
44644455
NL80211_ATTR_SUPPORT_MESH_AUTH = C.NL80211_ATTR_SUPPORT_MESH_AUTH
44654456
NL80211_ATTR_SURVEY_INFO = C.NL80211_ATTR_SURVEY_INFO
44664457
NL80211_ATTR_SURVEY_RADIO_STATS = C.NL80211_ATTR_SURVEY_RADIO_STATS
4458+
NL80211_ATTR_TD_BITMAP = C.NL80211_ATTR_TD_BITMAP
44674459
NL80211_ATTR_TDLS_ACTION = C.NL80211_ATTR_TDLS_ACTION
44684460
NL80211_ATTR_TDLS_DIALOG_TOKEN = C.NL80211_ATTR_TDLS_DIALOG_TOKEN
44694461
NL80211_ATTR_TDLS_EXTERNAL_SETUP = C.NL80211_ATTR_TDLS_EXTERNAL_SETUP

unix/zerrors_linux.go

+8-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

unix/ztypes_linux.go

+20-9
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)