Skip to content

Commit 49e1b22

Browse files
committed
Kernels (44): bump to 4.4-rc4
1 parent bdbc957 commit 49e1b22

File tree

4 files changed

+15
-18
lines changed

4 files changed

+15
-18
lines changed

linux44/PKGBUILD

+5-8
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ _basekernel=4.4
1313
_basever=44
1414
_aufs=20151123
1515
_bfq=v7r8
16-
_rc=rc3
16+
_rc=rc4
1717
pkgver=${_basekernel}${_rc}
1818
pkgrel=1
1919
arch=('i686' 'x86_64')
@@ -44,11 +44,10 @@ source=(#"https://www.kernel.org/pub/linux/kernel/v4.x/linux-${_basekernel}.tar.
4444
# ARCH Patches
4545
'change-default-console-loglevel.patch'
4646
# MANJARO Patches
47-
'fix-dependency-cycle-in-44rc1.patch::https://lkml.org/lkml/diff/2015/11/6/987/1'
4847
)
49-
sha256sums=('50396673a02762a2f5d229b6b228da17ee64f9d6288b60416bd8c0aac9b5e49d'
50-
'0ea4c5126b2088769fe1f5e308a4eb81c3a8d9e76f2d225748a4e1800d8a2c68'
51-
'384ea5b48f960838bbb1a6284df3bdb88dbd8c3db6b349ab0711e92f23ff24a3'
48+
sha256sums=('adf91a5dd8545d7db26da5a90d2a3ce490e90e9597b1b6798595544206dc1ddc'
49+
'bc537cc517a99f7d2b332bb6b2e1d96db1e9c28bec61cfd382fb2d8562d8be60'
50+
'63c36510f47d9753ca1ff46c3bcdd4d4db0505343947cfbe77855f6cea387bc2'
5251
'd1cecc720df66c70f43bdb86e0169d6b756161c870db8d7d39c32c04dc36ed36'
5352
'6d058de24e029651eef6e7e0133616eddf710aa51dfbba1652026f57a35e42ad'
5453
'47f2750c389f72d119f36a896634410d007c32e93d0ccefbe5ee71731fe5958e'
@@ -63,15 +62,13 @@ sha256sums=('50396673a02762a2f5d229b6b228da17ee64f9d6288b60416bd8c0aac9b5e49d'
6362
'ebeb62206999b2749ac43bb287a6a2a5db4f6b1b688a90cefa1ceb5db94aa490'
6463
'91b7cb42b8337b768e5329da205a6b61211628ec99b1e308e0e9d5283b2c86eb'
6564
'77430c7154670dd288b6d5bd45896222bf955f02029ee5d0cfe97cc5d9bc1a9d'
66-
'44e7e15c95af9676f715569e72688fd64304a70d2854b0f804c156d4961c72c0'
67-
'0dc6f70fc7bea0548975b766f2213ca95a7adfa3e69b55ac77c568e206084949')
65+
'44e7e15c95af9676f715569e72688fd64304a70d2854b0f804c156d4961c72c0')
6866

6967
prepare() {
7068
cd "${srcdir}/linux-${_basekernel}-${_rc}"
7169

7270
# add upstream patch
7371
#patch -p1 -i "${srcdir}/patch-${pkgver}"
74-
patch -p1 -i "${srcdir}/fix-dependency-cycle-in-44rc1.patch"
7572

7673
# add latest fixes from stable queue, if needed
7774
# http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git

linux44/config

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#
22
# Automatically generated file; DO NOT EDIT.
3-
# Linux/x86 4.4.0-1 Kernel Configuration
3+
# Linux/x86 4.4-rc4-1 Kernel Configuration
44
#
55
# CONFIG_64BIT is not set
66
CONFIG_X86_32=y
@@ -2087,6 +2087,7 @@ CONFIG_MEGARAID_SAS=m
20872087
CONFIG_SCSI_MPT3SAS=m
20882088
CONFIG_SCSI_MPT2SAS_MAX_SGE=128
20892089
CONFIG_SCSI_MPT3SAS_MAX_SGE=128
2090+
# CONFIG_SCSI_MPT2SAS is not set
20902091
CONFIG_SCSI_UFSHCD=m
20912092
CONFIG_SCSI_UFSHCD_PCI=m
20922093
CONFIG_SCSI_UFSHCD_PLATFORM=m
@@ -2463,6 +2464,7 @@ CONFIG_ATL1=m
24632464
CONFIG_ATL1E=m
24642465
CONFIG_ATL1C=m
24652466
CONFIG_ALX=m
2467+
# CONFIG_NET_VENDOR_AURORA is not set
24662468
CONFIG_NET_CADENCE=y
24672469
CONFIG_MACB=m
24682470
CONFIG_NET_VENDOR_BROADCOM=y
@@ -2543,7 +2545,6 @@ CONFIG_I40EVF=m
25432545
CONFIG_FM10K=m
25442546
# CONFIG_FM10K_VXLAN is not set
25452547
CONFIG_NET_VENDOR_I825XX=y
2546-
CONFIG_IP1000=m
25472548
CONFIG_JME=m
25482549
CONFIG_NET_VENDOR_MARVELL=y
25492550
CONFIG_MVMDIO=m
@@ -5599,7 +5600,6 @@ CONFIG_USB_DEFAULT_PERSIST=y
55995600
CONFIG_USB_DYNAMIC_MINORS=y
56005601
# CONFIG_USB_OTG is not set
56015602
# CONFIG_USB_OTG_WHITELIST is not set
5602-
# CONFIG_USB_OTG_FSM is not set
56035603
# CONFIG_USB_ULPI_BUS is not set
56045604
CONFIG_USB_MON=m
56055605
CONFIG_USB_WUSB=m

linux44/config.x86_64

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#
22
# Automatically generated file; DO NOT EDIT.
3-
# Linux/x86 4.4.0-1 Kernel Configuration
3+
# Linux/x86 4.4-rc4-1 Kernel Configuration
44
#
55
CONFIG_64BIT=y
66
CONFIG_X86_64=y
@@ -2064,6 +2064,7 @@ CONFIG_MEGARAID_SAS=m
20642064
CONFIG_SCSI_MPT3SAS=m
20652065
CONFIG_SCSI_MPT2SAS_MAX_SGE=128
20662066
CONFIG_SCSI_MPT3SAS_MAX_SGE=128
2067+
# CONFIG_SCSI_MPT2SAS is not set
20672068
CONFIG_SCSI_UFSHCD=m
20682069
CONFIG_SCSI_UFSHCD_PCI=m
20692070
CONFIG_SCSI_UFSHCD_PLATFORM=m
@@ -2409,6 +2410,7 @@ CONFIG_ATL1=m
24092410
CONFIG_ATL1E=m
24102411
CONFIG_ATL1C=m
24112412
CONFIG_ALX=m
2413+
# CONFIG_NET_VENDOR_AURORA is not set
24122414
CONFIG_NET_CADENCE=y
24132415
CONFIG_MACB=m
24142416
CONFIG_NET_VENDOR_BROADCOM=y
@@ -2491,7 +2493,6 @@ CONFIG_I40EVF=m
24912493
CONFIG_FM10K=m
24922494
# CONFIG_FM10K_VXLAN is not set
24932495
CONFIG_NET_VENDOR_I825XX=y
2494-
CONFIG_IP1000=m
24952496
CONFIG_JME=m
24962497
CONFIG_NET_VENDOR_MARVELL=y
24972498
CONFIG_MVMDIO=m
@@ -5389,7 +5390,6 @@ CONFIG_USB_DEFAULT_PERSIST=y
53895390
CONFIG_USB_DYNAMIC_MINORS=y
53905391
# CONFIG_USB_OTG is not set
53915392
# CONFIG_USB_OTG_WHITELIST is not set
5392-
# CONFIG_USB_OTG_FSM is not set
53935393
# CONFIG_USB_ULPI_BUS is not set
53945394
CONFIG_USB_MON=m
53955395
CONFIG_USB_WUSB=m

manjaro-hotfixes/PKGBUILD

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
# maintainer: Roland Singer <roland[at]manjaro[dog]org>
44

55
pkgname=('manjaro-hotfixes')
6-
pkgver=2013.03
7-
pkgrel=1
6+
pkgver=2015.12
7+
pkgrel=2
88
pkgdesc="Manjaro Linux Hotfixes"
99
arch=('any')
1010
url="http://www.manjaro.org"
1111
license=('GPL')
12-
groups=('base')
12+
depends=('polkit' 'dbus')
1313
source=('org.freedesktop.NetworkManager.Manjaro.conf' '99-manjaro.rules')
1414
sha256sums=('d3bda2f77205742445580c6dab2490744a4b779daef149c9ac15726cdf211e11'
1515
'd28d6ecaf7682860e2b3768bb266bd94313546b7cd0ef3c2eace7b1576c47adb')
@@ -22,7 +22,7 @@ package() {
2222
install -D -m644 ${srcdir}/org.freedesktop.NetworkManager.Manjaro.conf etc/dbus-1/system.d/
2323

2424
# enable power management and mount external partitions password-less
25-
install -d -m700 etc/polkit-1/rules.d/
25+
install -d -m750 etc/polkit-1/rules.d/
2626
install -D -m644 ${srcdir}/99-manjaro.rules etc/polkit-1/rules.d/
2727
chown 102 etc/polkit-1/rules.d
2828
}

0 commit comments

Comments
 (0)