diff options
author | Leonidas Spyropoulos | 2018-06-06 22:56:41 +0100 |
---|---|---|
committer | Leonidas Spyropoulos | 2018-06-06 22:56:41 +0100 |
commit | acf10484821950e320db6b8ee9d703c3bc91e9b7 (patch) | |
tree | f1e7018d99da2ac4ea9521bf5b3747953a04882e | |
parent | 2822ba0569659928f2a7a3409f17655ebe033921 (diff) | |
download | aur-acf10484821950e320db6b8ee9d703c3bc91e9b7.tar.gz |
upgpkg: linux-gc 4.17-1
upstream release
-rw-r--r-- | .SRCINFO | 30 | ||||
-rw-r--r-- | 0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch | 18 | ||||
-rw-r--r-- | 0002-Revert-drm-i915-edp-Allow-alternate-fixed-mode-for-e.patch (renamed from 0003-Revert-drm-i915-edp-Allow-alternate-fixed-mode-for-e.patch) | 46 | ||||
-rw-r--r-- | PKGBUILD | 31 |
4 files changed, 56 insertions, 69 deletions
@@ -1,5 +1,5 @@ pkgbase = linux-gc - pkgver = 4.16.13 + pkgver = 4.17 pkgrel = 1 url = http://cchalpha.blogspot.co.uk/ arch = x86_64 @@ -9,34 +9,28 @@ pkgbase = linux-gc makedepends = bc makedepends = libelf options = !strip - source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.16.tar.xz - source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.16.tar.sign - source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.16.13.xz - source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.16.13.sign + source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.17.tar.xz + source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.17.tar.sign source = config source = 60-linux.hook source = 90-linux.hook source = linux.preset source = enable_additional_cpu_optimizations-20180509.tar.gz::https://github.com/graysky2/kernel_gcc_patch/archive/20180509.tar.gz - source = v4.16_pds098p.patch::https://bitbucket.org/alfredchen/linux-gc/downloads/v4.16_pds098p.patch + source = v4.17_pds098q.patch::https://bitbucket.org/alfredchen/linux-gc/downloads/v4.17_pds098q.patch source = 0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch - source = 0002-ACPI-watchdog-Prefer-iTCO_wdt-on-Lenovo-Z50-70.patch - source = 0003-Revert-drm-i915-edp-Allow-alternate-fixed-mode-for-e.patch + source = 0002-Revert-drm-i915-edp-Allow-alternate-fixed-mode-for-e.patch validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886 validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E - sha256sums = 63f6dc8e3c9f3a0273d5d6f4dca38a2413ca3a5f689329d05b750e4c87bb21b9 - sha256sums = SKIP - sha256sums = 9efa0a74eb61240da53bd01a3a23759e0065811de53d22de7d679eabf847f323 + sha256sums = 9faa1dd896eaea961dc6e886697c0b3301277102e5bc976b2758f9a62d3ccd13 sha256sums = SKIP sha256sums = 8e76bd69e1f37a2698f4c460f9a465efc2171e6e6b3196c328b8f89bfdf63962 sha256sums = ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21 sha256sums = 75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919 sha256sums = ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65 sha256sums = 226e30068ea0fecdb22f337391385701996bfbdba37cdcf0f1dbf55f1080542d - sha256sums = 5e421e0c3fc60706640c202612c9d6b2de0f04499c90798e5e3b153fc356e6ef - sha256sums = 8d6a5f34b3d79e75b0cb888c6bcf293f84c5cbb2757f7bdadafee7e0ea77d7dd - sha256sums = 2454c1ee5e0f5aa119fafb4c8d3b402c5e4e10b2e868fe3e4ced3b1e2aa48446 - sha256sums = 8114295b8c07795a15b9f8eafb0f515c34661a1e05512da818a34581dd30f87e + sha256sums = 03c458dacd99dab4d8ea8fbbe449fd280184a25fc3cb200103eb40deb4b9e55a + sha256sums = 0b77e6bef12735bc91e3f0e8232512e973688466f2e8a2c3a93502cb2d4b4eed + sha256sums = 92615acad59cbef9fd43b2710f5a77ffea45a86543ccff1b12eb676a9c8058cc pkgname = linux-gc pkgdesc = The Linux-gc kernel and modules with the PDS-mq CPU scheduler @@ -46,12 +40,12 @@ pkgname = linux-gc depends = kmod depends = mkinitcpio>=0.7 optdepends = crda: to set the correct wireless channels of your country - provides = linux-gc=4.16.13 + provides = linux-gc=4.17 backup = etc/mkinitcpio.d/linux-gc.preset pkgname = linux-gc-headers pkgdesc = Header files and scripts for building modules for Linux-gc kernel depends = linux-gc - provides = linux-gc-headers=4.16.13 - provides = linux-headers=4.16.13 + provides = linux-gc-headers=4.17 + provides = linux-headers=4.17 diff --git a/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch b/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch index 3dd9a7d7039e..3db4ddd66983 100644 --- a/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch +++ b/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch @@ -1,8 +1,8 @@ -From ee91df95bf010fad44be5d2564e7d40038987f19 Mon Sep 17 00:00:00 2001 -Message-Id: <ee91df95bf010fad44be5d2564e7d40038987f19.1527290717.git.jan.steffens@gmail.com> +From b7e3d341f20581dcd72d3640fa8f6f99fd766d21 Mon Sep 17 00:00:00 2001 +Message-Id: <b7e3d341f20581dcd72d3640fa8f6f99fd766d21.1528140572.git.jan.steffens@gmail.com> From: Serge Hallyn <serge.hallyn@canonical.com> Date: Fri, 31 May 2013 19:12:12 +0100 -Subject: [PATCH 1/3] add sysctl to disallow unprivileged CLONE_NEWUSER by +Subject: [PATCH 1/2] add sysctl to disallow unprivileged CLONE_NEWUSER by default Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com> @@ -15,7 +15,7 @@ Signed-off-by: Daniel Micay <danielmicay@gmail.com> 3 files changed, 30 insertions(+) diff --git a/kernel/fork.c b/kernel/fork.c -index e5d9d405ae4e..c4be89c51f25 100644 +index a5d21c42acfc..675eb3f3a1d1 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -103,6 +103,11 @@ @@ -30,7 +30,7 @@ index e5d9d405ae4e..c4be89c51f25 100644 /* * Minimum number of threads to boot the kernel -@@ -1591,6 +1596,10 @@ static __latent_entropy struct task_struct *copy_process( +@@ -1592,6 +1597,10 @@ static __latent_entropy struct task_struct *copy_process( if ((clone_flags & (CLONE_NEWUSER|CLONE_FS)) == (CLONE_NEWUSER|CLONE_FS)) return ERR_PTR(-EINVAL); @@ -41,7 +41,7 @@ index e5d9d405ae4e..c4be89c51f25 100644 /* * Thread groups must share signals as well, and detached threads * can only be started up within the thread group. -@@ -2385,6 +2394,12 @@ SYSCALL_DEFINE1(unshare, unsigned long, unshare_flags) +@@ -2386,6 +2395,12 @@ int ksys_unshare(unsigned long unshare_flags) if (unshare_flags & CLONE_NEWNS) unshare_flags |= CLONE_FS; @@ -55,7 +55,7 @@ index e5d9d405ae4e..c4be89c51f25 100644 if (err) goto bad_unshare_out; diff --git a/kernel/sysctl.c b/kernel/sysctl.c -index f98f28c12020..7256d339a32a 100644 +index 6a78cf70761d..35a1d24282f4 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -105,6 +105,9 @@ extern int core_uses_pid; @@ -68,7 +68,7 @@ index f98f28c12020..7256d339a32a 100644 extern int pid_max; extern int pid_max_min, pid_max_max; extern int percpu_pagelist_fraction; -@@ -515,6 +518,15 @@ static struct ctl_table kern_table[] = { +@@ -519,6 +522,15 @@ static struct ctl_table kern_table[] = { .proc_handler = proc_dointvec, }, #endif @@ -99,5 +99,5 @@ index 246d4d4ce5c7..f64432b45cec 100644 static DEFINE_MUTEX(userns_state_mutex); -- -2.17.0 +2.17.1 diff --git a/0003-Revert-drm-i915-edp-Allow-alternate-fixed-mode-for-e.patch b/0002-Revert-drm-i915-edp-Allow-alternate-fixed-mode-for-e.patch index 78f97b2ddb3e..83ac849027ed 100644 --- a/0003-Revert-drm-i915-edp-Allow-alternate-fixed-mode-for-e.patch +++ b/0002-Revert-drm-i915-edp-Allow-alternate-fixed-mode-for-e.patch @@ -1,10 +1,10 @@ -From b7438d9dd645801027ab11470850033da0521338 Mon Sep 17 00:00:00 2001 -Message-Id: <b7438d9dd645801027ab11470850033da0521338.1527290717.git.jan.steffens@gmail.com> -In-Reply-To: <ee91df95bf010fad44be5d2564e7d40038987f19.1527290717.git.jan.steffens@gmail.com> -References: <ee91df95bf010fad44be5d2564e7d40038987f19.1527290717.git.jan.steffens@gmail.com> +From 997fbfe5508bc7d29fdf0a7a103f3864d4db380a Mon Sep 17 00:00:00 2001 +Message-Id: <997fbfe5508bc7d29fdf0a7a103f3864d4db380a.1528140572.git.jan.steffens@gmail.com> +In-Reply-To: <b7e3d341f20581dcd72d3640fa8f6f99fd766d21.1528140572.git.jan.steffens@gmail.com> +References: <b7e3d341f20581dcd72d3640fa8f6f99fd766d21.1528140572.git.jan.steffens@gmail.com> From: Jani Nikula <jani.nikula@intel.com> Date: Wed, 16 May 2018 11:01:10 +0300 -Subject: [PATCH 3/3] Revert "drm/i915/edp: Allow alternate fixed mode for eDP +Subject: [PATCH 2/2] Revert "drm/i915/edp: Allow alternate fixed mode for eDP if available." This reverts commit dc911f5bd8aacfcf8aabd5c26c88e04c837a938e. @@ -61,10 +61,10 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20180516080110.22770-1-jani. 6 files changed, 8 insertions(+), 45 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c -index 79521da5d11d..de0d0f83551e 100644 +index b7b4cfdeb974..48cb8df5ae97 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c -@@ -1584,23 +1584,6 @@ static int intel_dp_compute_bpp(struct intel_dp *intel_dp, +@@ -1671,23 +1671,6 @@ static int intel_dp_compute_bpp(struct intel_dp *intel_dp, return bpp; } @@ -88,7 +88,7 @@ index 79521da5d11d..de0d0f83551e 100644 bool intel_dp_compute_config(struct intel_encoder *encoder, struct intel_crtc_state *pipe_config, -@@ -1647,16 +1630,8 @@ intel_dp_compute_config(struct intel_encoder *encoder, +@@ -1734,16 +1717,8 @@ intel_dp_compute_config(struct intel_encoder *encoder, pipe_config->has_audio = intel_conn_state->force_audio == HDMI_AUDIO_ON; if (intel_dp_is_edp(intel_dp) && intel_connector->panel.fixed_mode) { @@ -107,7 +107,7 @@ index 79521da5d11d..de0d0f83551e 100644 if (INTEL_GEN(dev_priv) >= 9) { int ret; -@@ -5821,7 +5796,6 @@ static bool intel_edp_init_connector(struct intel_dp *intel_dp, +@@ -6121,7 +6096,6 @@ static bool intel_edp_init_connector(struct intel_dp *intel_dp, struct drm_i915_private *dev_priv = to_i915(dev); struct drm_connector *connector = &intel_connector->base; struct drm_display_mode *fixed_mode = NULL; @@ -115,7 +115,7 @@ index 79521da5d11d..de0d0f83551e 100644 struct drm_display_mode *downclock_mode = NULL; bool has_dpcd; struct drm_display_mode *scan; -@@ -5876,14 +5850,13 @@ static bool intel_edp_init_connector(struct intel_dp *intel_dp, +@@ -6176,14 +6150,13 @@ static bool intel_edp_init_connector(struct intel_dp *intel_dp, } intel_connector->edid = edid; @@ -132,7 +132,7 @@ index 79521da5d11d..de0d0f83551e 100644 } } -@@ -5920,8 +5893,7 @@ static bool intel_edp_init_connector(struct intel_dp *intel_dp, +@@ -6220,8 +6193,7 @@ static bool intel_edp_init_connector(struct intel_dp *intel_dp, pipe_name(pipe)); } @@ -143,10 +143,10 @@ index 79521da5d11d..de0d0f83551e 100644 intel_panel_setup_backlight(connector, pipe); diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h -index 30f791f89d64..9b75b82a2956 100644 +index a80fbad9be0f..7f3e83f17adb 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h -@@ -264,7 +264,6 @@ struct intel_encoder { +@@ -269,7 +269,6 @@ struct intel_encoder { struct intel_panel { struct drm_display_mode *fixed_mode; @@ -154,7 +154,7 @@ index 30f791f89d64..9b75b82a2956 100644 struct drm_display_mode *downclock_mode; /* backlight */ -@@ -1720,7 +1719,6 @@ void intel_overlay_reset(struct drm_i915_private *dev_priv); +@@ -1820,7 +1819,6 @@ void intel_overlay_reset(struct drm_i915_private *dev_priv); /* intel_panel.c */ int intel_panel_init(struct intel_panel *panel, struct drm_display_mode *fixed_mode, @@ -163,10 +163,10 @@ index 30f791f89d64..9b75b82a2956 100644 void intel_panel_fini(struct intel_panel *panel); void intel_fixed_panel_mode(const struct drm_display_mode *fixed_mode, diff --git a/drivers/gpu/drm/i915/intel_dsi.c b/drivers/gpu/drm/i915/intel_dsi.c -index f67d321376e4..551bf1c14093 100644 +index 51a1d6868b1e..cf39ca90d887 100644 --- a/drivers/gpu/drm/i915/intel_dsi.c +++ b/drivers/gpu/drm/i915/intel_dsi.c -@@ -1851,7 +1851,7 @@ void intel_dsi_init(struct drm_i915_private *dev_priv) +@@ -1846,7 +1846,7 @@ void intel_dsi_init(struct drm_i915_private *dev_priv) connector->display_info.width_mm = fixed_mode->width_mm; connector->display_info.height_mm = fixed_mode->height_mm; @@ -176,10 +176,10 @@ index f67d321376e4..551bf1c14093 100644 intel_dsi_add_properties(intel_connector); diff --git a/drivers/gpu/drm/i915/intel_dvo.c b/drivers/gpu/drm/i915/intel_dvo.c -index 754baa00bea9..05bd65e37cb5 100644 +index eb0c559b2715..a70d767313aa 100644 --- a/drivers/gpu/drm/i915/intel_dvo.c +++ b/drivers/gpu/drm/i915/intel_dvo.c -@@ -537,7 +537,7 @@ void intel_dvo_init(struct drm_i915_private *dev_priv) +@@ -536,7 +536,7 @@ void intel_dvo_init(struct drm_i915_private *dev_priv) */ intel_panel_init(&intel_connector->panel, intel_dvo_get_current_mode(intel_encoder), @@ -189,10 +189,10 @@ index 754baa00bea9..05bd65e37cb5 100644 } diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c -index 7ed6f7b69556..ab5a63f007eb 100644 +index e125d16a1aa7..d278f24ba6ae 100644 --- a/drivers/gpu/drm/i915/intel_lvds.c +++ b/drivers/gpu/drm/i915/intel_lvds.c -@@ -1128,8 +1128,7 @@ void intel_lvds_init(struct drm_i915_private *dev_priv) +@@ -1175,8 +1175,7 @@ void intel_lvds_init(struct drm_i915_private *dev_priv) out: mutex_unlock(&dev->mode_config.mutex); @@ -203,10 +203,10 @@ index 7ed6f7b69556..ab5a63f007eb 100644 lvds_encoder->is_dual_link = compute_is_dual_link_lvds(lvds_encoder); diff --git a/drivers/gpu/drm/i915/intel_panel.c b/drivers/gpu/drm/i915/intel_panel.c -index fa6831f8c004..c0ac6d6bf8ef 100644 +index 41d00b1603e3..b443278e569c 100644 --- a/drivers/gpu/drm/i915/intel_panel.c +++ b/drivers/gpu/drm/i915/intel_panel.c -@@ -1924,30 +1924,24 @@ intel_panel_init_backlight_funcs(struct intel_panel *panel) +@@ -1928,30 +1928,24 @@ intel_panel_init_backlight_funcs(struct intel_panel *panel) int intel_panel_init(struct intel_panel *panel, struct drm_display_mode *fixed_mode, @@ -238,5 +238,5 @@ index fa6831f8c004..c0ac6d6bf8ef 100644 drm_mode_destroy(intel_connector->base.dev, panel->downclock_mode); -- -2.17.0 +2.17.1 @@ -31,20 +31,20 @@ _localmodcfg= ### IMPORTANT: Do no edit below this line unless you know what you're doing pkgbase=linux-gc -_srcname=linux-4.16 -pkgver=4.16.13 +_srcname=linux-4.17 +pkgver=4.17 pkgrel=1 -_pdsversion=098p +_pdsversion=098q arch=('x86_64') url="http://cchalpha.blogspot.co.uk/" license=('GPL2') makedepends=('kmod' 'inetutils' 'bc' 'libelf') options=('!strip') -_psd_patch="v4.16_pds${_pdsversion}.patch" +_psd_patch="v${pkgver}_pds${_pdsversion}.patch" _gcc_more_v='20180509' source=( https://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.{xz,sign} - https://www.kernel.org/pub/linux/kernel/v4.x/patch-${pkgver}.{xz,sign} + #https://www.kernel.org/pub/linux/kernel/v4.x/patch-${pkgver}.{xz,sign} config # the main kernel config file 60-linux.hook # pacman hook for depmod 90-linux.hook # pacman hook for initramfs regeneration @@ -52,26 +52,22 @@ source=( "enable_additional_cpu_optimizations-$_gcc_more_v.tar.gz::https://github.com/graysky2/kernel_gcc_patch/archive/$_gcc_more_v.tar.gz" # enable_additional_cpu_optimizations_for_gcc "$_psd_patch::https://bitbucket.org/alfredchen/linux-gc/downloads/${_psd_patch}" 0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch - 0002-ACPI-watchdog-Prefer-iTCO_wdt-on-Lenovo-Z50-70.patch - 0003-Revert-drm-i915-edp-Allow-alternate-fixed-mode-for-e.patch + 0002-Revert-drm-i915-edp-Allow-alternate-fixed-mode-for-e.patch ) validpgpkeys=( 'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds '647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman ) -sha256sums=('63f6dc8e3c9f3a0273d5d6f4dca38a2413ca3a5f689329d05b750e4c87bb21b9' - 'SKIP' - '9efa0a74eb61240da53bd01a3a23759e0065811de53d22de7d679eabf847f323' +sha256sums=('9faa1dd896eaea961dc6e886697c0b3301277102e5bc976b2758f9a62d3ccd13' 'SKIP' '8e76bd69e1f37a2698f4c460f9a465efc2171e6e6b3196c328b8f89bfdf63962' 'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21' '75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919' 'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65' '226e30068ea0fecdb22f337391385701996bfbdba37cdcf0f1dbf55f1080542d' - '5e421e0c3fc60706640c202612c9d6b2de0f04499c90798e5e3b153fc356e6ef' - '8d6a5f34b3d79e75b0cb888c6bcf293f84c5cbb2757f7bdadafee7e0ea77d7dd' - '2454c1ee5e0f5aa119fafb4c8d3b402c5e4e10b2e868fe3e4ced3b1e2aa48446' - '8114295b8c07795a15b9f8eafb0f515c34661a1e05512da818a34581dd30f87e') + '03c458dacd99dab4d8ea8fbbe449fd280184a25fc3cb200103eb40deb4b9e55a' + '0b77e6bef12735bc91e3f0e8232512e973688466f2e8a2c3a93502cb2d4b4eed' + '92615acad59cbef9fd43b2710f5a77ffea45a86543ccff1b12eb676a9c8058cc') _kernelname=${pkgbase#linux} @@ -79,7 +75,7 @@ prepare() { cd ${_srcname} # add upstream patch - patch -p1 -i ../patch-${pkgver} + #patch -p1 -i ../patch-${pkgver} # add latest fixes from stable queue, if needed # http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git @@ -87,11 +83,8 @@ prepare() { # disable USER_NS for non-root users by default patch -Np1 -i ../0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch - # https://bugs.archlinux.org/task/56780 - patch -Np1 -i ../0002-ACPI-watchdog-Prefer-iTCO_wdt-on-Lenovo-Z50-70.patch - # https://bugs.archlinux.org/task/56711 - patch -Np1 -i ../0003-Revert-drm-i915-edp-Allow-alternate-fixed-mode-for-e.patch + patch -Np1 -i ../0002-Revert-drm-i915-edp-Allow-alternate-fixed-mode-for-e.patch # Patch source with PDS scheduler patch -Np1 -i "../${_psd_patch}" |