From d770327399f6da04a532e9a50965c9f5af901e10 Mon Sep 17 00:00:00 2001 From: Daniel Nachun Date: Tue, 20 Jul 2021 23:17:59 -0700 Subject: [PATCH] linux-headers@4.15 (new formula) (#81273) * linux-headers@4.15: new formula * linux-headers: rename to linux-headers@4.4 * linux-headers@4.4: renamed from linux-headers * linux-headers: make alias to linux-headers@4.4 * formula_renames.json: rename linux-headers to linux-headers@4.4 * versioned_keg_only_allowlist: add linux-headers@4.4 * glibc: use linux-headers@4.4 * strace: use linux-headers@4.4 --- Aliases/linux-headers | 1 + Formula/glibc.rb | 2 +- Formula/linux-headers@4.15.rb | 19 +++++++++++++++++++ ...{linux-headers.rb => linux-headers@4.4.rb} | 6 +----- Formula/strace.rb | 2 +- .../versioned_keg_only_allowlist.json | 1 + formula_renames.json | 1 + 7 files changed, 25 insertions(+), 7 deletions(-) create mode 120000 Aliases/linux-headers create mode 100644 Formula/linux-headers@4.15.rb rename Formula/{linux-headers.rb => linux-headers@4.4.rb} (74%) diff --git a/Aliases/linux-headers b/Aliases/linux-headers new file mode 120000 index 00000000000..6929c91405b --- /dev/null +++ b/Aliases/linux-headers @@ -0,0 +1 @@ +../Formula/linux-headers@4.4.rb \ No newline at end of file diff --git a/Formula/glibc.rb b/Formula/glibc.rb index ec8f6813c01..b69cfbcd806 100644 --- a/Formula/glibc.rb +++ b/Formula/glibc.rb @@ -95,7 +95,7 @@ class Glibc < Formula depends_on "binutils" => :build depends_on GawkRequirement => :build - depends_on "linux-headers" => :build + depends_on "linux-headers@4.4" => :build depends_on MakeRequirement => :build depends_on SedRequirement => :build depends_on BrewedGlibcNotOlderRequirement diff --git a/Formula/linux-headers@4.15.rb b/Formula/linux-headers@4.15.rb new file mode 100644 index 00000000000..769786ff29e --- /dev/null +++ b/Formula/linux-headers@4.15.rb @@ -0,0 +1,19 @@ +class LinuxHeadersAT415 < Formula + desc "Header files of the Linux kernel" + homepage "https://kernel.org/" + url "https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-4.15.18.tar.gz" + sha256 "ca13fa5c6e3a6b434556530d92bc1fc86532c2f4f5ae0ed766f6b709322d6495" + license "GPL-2.0-only" + keg_only :versioned_formula + + depends_on :linux + + def install + system "make", "headers_install", "INSTALL_HDR_PATH=#{prefix}" + rm Dir[prefix/"**/{.install,..install.cmd}"] + end + + test do + assert_match "KERNEL_VERSION", File.read(include/"linux/version.h") + end +end diff --git a/Formula/linux-headers.rb b/Formula/linux-headers@4.4.rb similarity index 74% rename from Formula/linux-headers.rb rename to Formula/linux-headers@4.4.rb index 14b257c5e4e..3826d8e8404 100644 --- a/Formula/linux-headers.rb +++ b/Formula/linux-headers@4.4.rb @@ -1,14 +1,10 @@ -class LinuxHeaders < Formula +class LinuxHeadersAT44 < Formula desc "Header files of the Linux kernel" homepage "https://kernel.org/" url "https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-4.4.80.tar.gz" sha256 "291d844619b5e7c43bd5aa0b2c286274fc5ffe31494ba475f167a21157e88186" license "GPL-2.0-only" - bottle do - sha256 cellar: :any_skip_relocation, x86_64_linux: "a726f1ea608c17987bb444c0d42add7d1a225ad16897b21cf33ae599926b933e" - end - depends_on :linux def install diff --git a/Formula/strace.rb b/Formula/strace.rb index a45f5af41f7..f5c2ebbbf35 100644 --- a/Formula/strace.rb +++ b/Formula/strace.rb @@ -16,7 +16,7 @@ class Strace < Formula end depends_on :linux - depends_on "linux-headers" + depends_on "linux-headers@4.4" def install system "./bootstrap" if build.head? diff --git a/audit_exceptions/versioned_keg_only_allowlist.json b/audit_exceptions/versioned_keg_only_allowlist.json index 5127144b0b0..898b1e2fa0a 100644 --- a/audit_exceptions/versioned_keg_only_allowlist.json +++ b/audit_exceptions/versioned_keg_only_allowlist.json @@ -16,6 +16,7 @@ "libsigc++@2", "libxml++@4", "libxml++@5", + "linux-headers@4.4", "lua@5.1", "numpy@1.16", "openssl@1.1", diff --git a/formula_renames.json b/formula_renames.json index dd606781237..db2578f3705 100644 --- a/formula_renames.json +++ b/formula_renames.json @@ -86,6 +86,7 @@ "libcppa": "caf", "libmongoclient": "mongo-cxx-driver", "libsasl2": "cyrus-sasl", + "linux-headers": "linux-headers@4.4", "lua51": "lua@5.1", "mat": "mat2", "maven32": "maven@3.2",