Skip to content

Commit 00e2c43

Browse files
hphilmhphilm
committed
Modifications
- linux410: bump to v4.10.2 - linux411: bump to rc1 - linux44: bump to v4.4.53 - linux49: bump to v4.9.14 - manjaro-system: fix libgl - mhwd: adopt to libgl changes - pm-mirrorlist-dev: newer snapshot
1 parent 92294c1 commit 00e2c43

18 files changed

+109
-116
lines changed

‎kernel-modules-i686.sum

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ c3e1e03d274e07be89afc7c896be19f4 Kernel: 3.10.105-1-MANJARO
22
f4735186f2ab5b5ed51a4eca11ba7b1b Kernel: 3.12.71-1-MANJARO
33
69f17d64f3eb9baf5c1bfd52f24a19eb Kernel: 3.16.41-1-MANJARO
44
1d18f0a226853bf4ca8fd2d79188ca19 Kernel: 3.18.48-2-MANJARO
5-
b7056831817713c3cbd24f855c9e1f05 Kernel: 4.10.1-1-MANJARO
5+
c2b1c6f4f2365a453a3c2ef4fc5641ff Kernel: 4.10.2-1-MANJARO
66
4545ecba84f5ab56f1c8191ab30e3a45 Kernel: 4.11.0-1-MANJARO
77
3559af819bf9da893d3ffe641728d875 Kernel: 4.1.38-2-MANJARO
8-
de0f1852eff581353c0caaedf4903e29 Kernel: 4.4.52-1-MANJARO
8+
2442efaffa527c59b2de253e1059772f Kernel: 4.4.53-1-MANJARO
99
afa7cc546e2ce39dbf2588db5cfd4d23 Kernel: 4.8.17-1-MANJARO
10-
2d6cd6e10eb3055016018a18d55d8f1a Kernel: 4.9.13-1-MANJARO
10+
733aaeaf01f3046e7b5b0559b9393439 Kernel: 4.9.14-1-MANJARO

‎kernel-modules-x86_64.sum

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ ac791570ee5d4a5dd4057ff81aaa691d Kernel: 3.10.105-1-MANJARO
22
56f7a41e38e62d50ae58dd0425624a1d Kernel: 3.12.71-1-MANJARO
33
8ab8139188896f726ebfd9fccc2d569c Kernel: 3.16.41-1-MANJARO
44
dbc550042a38d0a4b90a6e81efbbbb4d Kernel: 3.18.48-2-MANJARO
5-
8b69da41ba77912b126de76eeea61c6c Kernel: 4.10.1-1-MANJARO
5+
58d0e26c3b739952ac52ef285a637ee0 Kernel: 4.10.2-1-MANJARO
66
0c8dba8578e4ed38e321c707c79d1f3f Kernel: 4.11.0-1-MANJARO
77
9093d68d8e98f86e3da3f7be98d57cca Kernel: 4.1.38-2-MANJARO
8-
972590bdc837a85c593d5c0283a9074b Kernel: 4.4.52-1-MANJARO
8+
2098f4161874ba44b2d5fccf292d251f Kernel: 4.4.53-1-MANJARO
99
1795ec19f2cf1c7fcf8c442461f6527f Kernel: 4.8.17-1-MANJARO
10-
8308643ebb86fd790e73fbc6de6cf664 Kernel: 4.9.13-1-MANJARO
10+
85092eaaf63509bbc33a25c69f059c97 Kernel: 4.9.14-1-MANJARO

‎linux410/PKGBUILD

+11-11
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ pkgname=('linux410' 'linux410-headers')
1111
_kernelname=-MANJARO
1212
_basekernel=4.10
1313
_basever=410
14-
_aufs=20170220
14+
_aufs=20170313
1515
_bfq=v8r8
16-
_sub=1
16+
_sub=2
1717
_git=c470abd4fde40ea6a0846a2beab642a578c0b8cd
1818
pkgver=${_basekernel}.${_sub}
1919
pkgrel=1
@@ -32,7 +32,7 @@ source=("https://www.kernel.org/pub/linux/kernel/v4.x/linux-${_basekernel}.tar.x
3232
# standard config files for mkinitcpio ramdisk
3333
"${pkgbase}.preset"
3434
"${pkgbase}.hook"
35-
"aufs4.x-rcN-${_aufs}.patch.bz2"
35+
"aufs4.10-${_aufs}.patch.bz2"
3636
'aufs4-base.patch'
3737
'aufs4-kbuild.patch'
3838
'aufs4-loopback.patch'
@@ -53,18 +53,18 @@ source=("https://www.kernel.org/pub/linux/kernel/v4.x/linux-${_basekernel}.tar.x
5353
'0005-bfq-wb-4.10-disable-WBT-for-non-root-cgroup.patch::https://github.com/pfactum/pf-kernel/commit/154a26bdff29d02c3e31c80b5d1042b03fbcd2fa.patch'
5454
)
5555
sha256sums=('3c95d9f049bd085e5c346d2c77f063b8425f191460fcd3ae9fe7e94e0477dc4b'
56-
'da560125aa350f76f0e4a5b9373a0d0a1c27ccefe3b7bd9231724f3a3c4ebb9e'
56+
'3e2c2ba9dd2c421ea4f7e10150cc5f5fa5fdbaffef5377988fabb7d6f7d65bab'
5757
'5e978fb93e5bda10eca3bd1db4dffdb8dc8726366cd32615e58ad6da3263afce'
5858
'b3873646765ae2c377037697cfefee103812276de1b75cc4a62d25296c0024a4'
5959
'd1cecc720df66c70f43bdb86e0169d6b756161c870db8d7d39c32c04dc36ed36'
6060
'43942683a7ff01b180dff7f3de2db4885d43ab3d4e7bd0e1918c3aaf2ee061f4'
6161
'5016e07c4afa91866566f6812aa7a4c69537d3abf64076c0307863f45a491e77'
62-
'1e57cfe768eb812977aba92e52a7ea42e04896453546836f8c38a722c33fed65'
63-
'59d70dc16f6226e97f4dfa08bb2e72e141c67e2b7aeb6d33d7fa6768c80cfa87'
64-
'4b2ce04256ab6447b0a3a75b8a1a463092370fd6777e11bcb8b8668da46f0f06'
65-
'9ad60f79bfb1a9e36e63ca0342d0cfdea3a4fc0f7440af10901925e1763c9487'
66-
'0545274c1f412fcdd8ea259d07deb50e9bdadc3ce1aa0b9901b29e2cfe4c48a0'
67-
'270f667d7d5daec05df58717c115ecb4d1eb9f9fc36d4b87e44a61ed9c50bb62'
62+
'617ebfb8af54dc134a0f26b4ffd3c63497d6a783d5ed3139380432164ffe9820'
63+
'5ed128bff19b62c7f826eae008727ec5f7ac8b711bcc24699d2342955c958c9b'
64+
'a92927f02df24dc0d9e9cec92944792b243c2412987963aaf7c5a4431ef1deca'
65+
'3a8a6227f5de8903446af760291247a733990fb4ca2705175199e1ad2190a91b'
66+
'c703f58734e3c36b1c4eddf41f3ecafa4164d9627cf700b8354abebd0474b5a8'
67+
'3bc608250e4c438a21298c0f0ee2fb073c096cd7491a365e693312f62810fe7c'
6868
'd9c042efeba611c0fba58e3f1558557b4f832dc55415bb9405c170b2af027d1e'
6969
'e13bf072112864338cf610c8d694b8d82ae08844851b80d6d3f1cb61e112290e'
7070
'f75f39e9efd056875c2212ac52fdedac0d4a37e1878389e3557769435c28ca2d'
@@ -94,7 +94,7 @@ prepare() {
9494
patch -p1 -i "${srcdir}/0003-HID-multitouch-enable-Surface-3-Type-Cover-Pro-to-report-multitouch-data.patch"
9595

9696
# add aufs4 support
97-
patch -Np1 -i "${srcdir}/aufs4.x-rcN-${_aufs}.patch"
97+
patch -Np1 -i "${srcdir}/aufs4.10-${_aufs}.patch"
9898

9999
# vfs: remove ".readlink = generic_readlink" assignments
100100
# https://github.com/torvalds/linux/commit/dfeef68862edd7d4bafe68ef7aeb5f658ef24bb5

‎linux410/aufs4-base.patch

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
aufs4.x-rcN base patch
1+
aufs4.10 base patch
22

33
diff --git a/MAINTAINERS b/MAINTAINERS
4-
index 107c10e..dd8df20 100644
4+
index 527d137..b6ea8ae 100644
55
--- a/MAINTAINERS
66
+++ b/MAINTAINERS
77
@@ -2308,6 +2308,19 @@ F: include/linux/audit.h
@@ -135,10 +135,10 @@ index 5816d4c..670b365 100644
135135
{
136136
mm_segment_t old_fs;
137137
diff --git a/fs/splice.c b/fs/splice.c
138-
index 873d831..7899532 100644
138+
index 4ef78aa..178acc0 100644
139139
--- a/fs/splice.c
140140
+++ b/fs/splice.c
141-
@@ -856,8 +856,8 @@ EXPORT_SYMBOL(generic_splice_sendpage);
141+
@@ -857,8 +857,8 @@ EXPORT_SYMBOL(generic_splice_sendpage);
142142
/*
143143
* Attempt to initiate a splice from pipe to file.
144144
*/
@@ -149,7 +149,7 @@ index 873d831..7899532 100644
149149
{
150150
ssize_t (*splice_write)(struct pipe_inode_info *, struct file *,
151151
loff_t *, size_t, unsigned int);
152-
@@ -873,9 +873,9 @@ static long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
152+
@@ -874,9 +874,9 @@ static long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
153153
/*
154154
* Attempt to initiate a splice from a file to a pipe.
155155
*/

‎linux410/aufs4-kbuild.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
aufs4.x-rcN kbuild patch
1+
aufs4.10 kbuild patch
22

33
diff --git a/fs/Kconfig b/fs/Kconfig
44
index 83eab52..31f16c4 100644

‎linux410/aufs4-loopback.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
aufs4.x-rcN loopback patch
1+
aufs4.10 loopback patch
22

33
diff --git a/drivers/block/loop.c b/drivers/block/loop.c
44
index b63f68b..c0f4b8c 100644

‎linux410/aufs4-mmap.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
aufs4.x-rcN mmap patch
1+
aufs4.10 mmap patch
22

33
diff --git a/fs/proc/base.c b/fs/proc/base.c
44
index 87c9a9a..a0196f0 100644

‎linux410/aufs4-standalone.patch

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
aufs4.x-rcN standalone patch
1+
aufs4.10 standalone patch
22

33
diff --git a/fs/dcache.c b/fs/dcache.c
44
index 8ca5f09..b1ff5be 100644
@@ -225,18 +225,18 @@ index 670b365..f9f8bb1 100644
225225
ssize_t __kernel_write(struct file *file, const char *buf, size_t count, loff_t *pos)
226226
{
227227
diff --git a/fs/splice.c b/fs/splice.c
228-
index 7899532..c0df111 100644
228+
index 178acc0..d1569fa 100644
229229
--- a/fs/splice.c
230230
+++ b/fs/splice.c
231-
@@ -869,6 +869,7 @@ long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
231+
@@ -870,6 +870,7 @@ long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
232232

233233
return splice_write(pipe, out, ppos, len, flags);
234234
}
235235
+EXPORT_SYMBOL_GPL(do_splice_from);
236236

237237
/*
238238
* Attempt to initiate a splice from a file to a pipe.
239-
@@ -898,6 +899,7 @@ long do_splice_to(struct file *in, loff_t *ppos,
239+
@@ -899,6 +900,7 @@ long do_splice_to(struct file *in, loff_t *ppos,
240240

241241
return splice_read(in, ppos, pipe, len, flags);
242242
}

‎linux410/aufs4.10-20170313.patch.bz2

141 KB
Binary file not shown.

‎linux410/create-aufs.sh

+10-10
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ rm -Rf aufs4-standalone
55
git clone git://github.com/sfjro/aufs4-standalone.git aufs4-standalone
66
cd aufs4-standalone
77
git branch -r
8-
git checkout origin/aufs4.x-rcN
8+
git checkout origin/aufs4.10
99

1010
# modify what you want
1111

@@ -15,16 +15,16 @@ git checkout origin/aufs4.x-rcN
1515
rm -v $(find . -type f -name '*.orig')
1616
#grep -qse 'EXPORT_SYMBOL(' aufs4-standalone.patch && \
1717
#sed -i-old -e 's|EXPORT_SYMBOL(|EXPORT_SYMBOL_GPL(|' aufs4-standalone.patch
18-
rm -rf ../tmp/linux-4.x-rcN
19-
mkdir -p ../tmp/linux-4.x-rcN
20-
cp -a fs ../tmp/linux-4.x-rcN
21-
cp -a include ../tmp/linux-4.x-rcN
22-
cp -a Documentation ../tmp/linux-4.x-rcN
23-
rm ../tmp/linux-4.x-rcN/include/uapi/linux/Kbuild
18+
rm -rf ../tmp/linux-4.10
19+
mkdir -p ../tmp/linux-4.10
20+
cp -a fs ../tmp/linux-4.10
21+
cp -a include ../tmp/linux-4.10
22+
cp -a Documentation ../tmp/linux-4.10
23+
rm ../tmp/linux-4.10/include/uapi/linux/Kbuild
2424
cd ../tmp
25-
diff -Naur null linux-4.x-rcN | filterdiff | \
26-
sed -e 's|null\(/include/uapi/linux/Kbuild\)|linux-4.x-rcN-old\1|;s|^--- null.*|--- /dev/null|;\|linux-4.x-rcN/include/uapi/linux/Kbuild|,${\|@@ -0,0 +1 @@|,$d}' | \
27-
bzip2 > aufs$(sed -ne 's|#define.*AUFS_VERSION.*"\(.*\)"|\1|p' linux-4.x-rcN/include/uapi/linux/aufs_type.h).patch.bz2
25+
diff -Naur null linux-4.10 | filterdiff | \
26+
sed -e 's|null\(/include/uapi/linux/Kbuild\)|linux-4.10-old\1|;s|^--- null.*|--- /dev/null|;\|linux-4.10/include/uapi/linux/Kbuild|,${\|@@ -0,0 +1 @@|,$d}' | \
27+
bzip2 > aufs$(sed -ne 's|#define.*AUFS_VERSION.*"\(.*\)"|\1|p' linux-4.10/include/uapi/linux/aufs_type.h).patch.bz2
2828
mv *.bz2 $OLDPWD
2929
cd $OLDPWD
3030
mv *patch* ..

‎linux411/PKGBUILD

+28-28
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ pkgname=('linux411' 'linux411-headers')
1111
_kernelname=-MANJARO
1212
_basekernel=4.11
1313
_basever=411
14-
_aufs=20170220
14+
_aufs=20170313
1515
_bfq=v8r8
1616
_rc=rc1
1717
_sub=1
@@ -29,18 +29,18 @@ source=(#"https://www.kernel.org/pub/linux/kernel/v4.x/linux-${_basekernel}.tar.
2929
#linux-${_basekernel}-${pkgrel}.tar.gz::https://github.com/torvalds/linux/archive/${_git}.tar.gz
3030
#"http://www.kernel.org/pub/linux/kernel/v4.x/patch-${pkgver}.xz"
3131
# the main kernel config files
32-
'config' 'config.x86_64' #'config.aufs'
32+
'config' 'config.x86_64' 'config.aufs'
3333
# standard config files for mkinitcpio ramdisk
3434
"${pkgbase}.preset"
3535
"${pkgbase}.hook"
36-
#"aufs4.x-rcN-${_aufs}.patch.bz2"
37-
#'aufs4-base.patch'
38-
#'aufs4-kbuild.patch'
39-
#'aufs4-loopback.patch'
40-
#'aufs4-mmap.patch'
41-
#'aufs4-standalone.patch'
42-
#'tmpfs-idr.patch'
43-
#'vfs-ino.patch'
36+
"aufs4.x-rcN-${_aufs}.patch.bz2"
37+
'aufs4-base.patch'
38+
'aufs4-kbuild.patch'
39+
'aufs4-loopback.patch'
40+
'aufs4-mmap.patch'
41+
'aufs4-standalone.patch'
42+
'tmpfs-idr.patch'
43+
'vfs-ino.patch'
4444
"0001-BFQ-${_bfq}-v${pkgver}.patch::https://github.com/linusw/linux-bfq/compare/bc49a78...e1f3b01.patch"
4545
#"0001-block-cgroups-kconfig-build-bits-for-BFQ-${_bfq}.patch::http://algo.ing.unimo.it/people/paolo/disk_sched/patches/4.10.0-${_bfq}/0001-block-cgroups-kconfig-build-bits-for-BFQ-v7r11-${_basekernel}..patch"
4646
#"0002-block-introduce-the-BFQ-${_bfq}-I-O-sched.patch::http://algo.ing.unimo.it/people/paolo/disk_sched/patches/4.10.0-${_bfq}/0002-block-introduce-the-BFQ-v7r11-I-O-sched-for-4.10.0.patch"
@@ -54,8 +54,17 @@ source=(#"https://www.kernel.org/pub/linux/kernel/v4.x/linux-${_basekernel}.tar.
5454
sha256sums=('14093d085a0ea603524cbc0d6b51d93caec7431c63d6301169a5081eb1f4eca7'
5555
'e0aa564d4173109e07e3360bfb69053e3b3612f5a3874de712922c224e546633'
5656
'827ec66d3dd1aa465a94fae56fc1d4d99c7df0644c240c2c719f491b4617b9de'
57+
'd1cecc720df66c70f43bdb86e0169d6b756161c870db8d7d39c32c04dc36ed36'
5758
'43942683a7ff01b180dff7f3de2db4885d43ab3d4e7bd0e1918c3aaf2ee061f4'
5859
'5016e07c4afa91866566f6812aa7a4c69537d3abf64076c0307863f45a491e77'
60+
'b0a5ad2befd96b7a8ca659250844a59d6b85402b5f508de7114ffd86fff92020'
61+
'c4e6c13ede8888d7922f3c141de585f6d917651b159474947f6c151617cd4fab'
62+
'6a1ace02eea06588432534e42b0df1285181f7f2769371383cf8ddc3a811b338'
63+
'f8460032daef0d797b8ab858f71fabf19855c85358211a28683a9e22074254dd'
64+
'2ca48070268ec84267d605666b8624f6201e7a96bebb3c93fde08b693a070417'
65+
'359ba039aafaebe88deffc3a6118fd259ee1a49622337bd975c0dd265caf001c'
66+
'1ab62bf24ccb89c027b1656b08755e6c31f119ceac9aeb1b17b1cc9be318eeeb'
67+
'e13bf072112864338cf610c8d694b8d82ae08844851b80d6d3f1cb61e112290e'
5968
'6416a778e4535cf9b8dccd2eee7a130c64def541baaebebd329031e0c9a451ec'
6069
'ef5d899e7e7cf2f0bbf6cb149a83a16bce48be2b3412155ad7979240ae5ff314')
6170

@@ -73,23 +82,14 @@ prepare() {
7382
#patch -Np1 -i "${srcdir}/prepatch-${_basekernel}`date +%Y%m%d`"
7483

7584
# add aufs4 support
76-
#patch -Np1 -i "${srcdir}/aufs4.x-rcN-${_aufs}.patch"
77-
78-
# vfs: remove ".readlink = generic_readlink" assignments
79-
# https://github.com/torvalds/linux/commit/dfeef68862edd7d4bafe68ef7aeb5f658ef24bb5
80-
#sed -e "/generic_readlink/ d" -i "${srcdir}/linux-${_basekernel}/fs/aufs/i_op.c"
81-
82-
# fsnotify(): constify 'data'
83-
# https://github.com/torvalds/linux/commit/e637835eccc8b93f39ca869628f9a0437bba744e
84-
#sed -e 's/void \*data/const void \*data/' -i "${srcdir}/linux-${_basekernel}/fs/aufs/hfsnotify.c"
85-
86-
#patch -Np1 -i "${srcdir}/aufs4-base.patch"
87-
#patch -Np1 -i "${srcdir}/aufs4-kbuild.patch"
88-
#patch -Np1 -i "${srcdir}/aufs4-loopback.patch"
89-
#patch -Np1 -i "${srcdir}/aufs4-mmap.patch"
90-
#patch -Np1 -i "${srcdir}/aufs4-standalone.patch"
91-
#patch -Np1 -i "${srcdir}/tmpfs-idr.patch"
92-
#patch -Np1 -i "${srcdir}/vfs-ino.patch"
85+
patch -Np1 -i "${srcdir}/aufs4.x-rcN-${_aufs}.patch"
86+
patch -Np1 -i "${srcdir}/aufs4-base.patch"
87+
patch -Np1 -i "${srcdir}/aufs4-kbuild.patch"
88+
patch -Np1 -i "${srcdir}/aufs4-loopback.patch"
89+
patch -Np1 -i "${srcdir}/aufs4-mmap.patch"
90+
patch -Np1 -i "${srcdir}/aufs4-standalone.patch"
91+
patch -Np1 -i "${srcdir}/tmpfs-idr.patch"
92+
patch -Np1 -i "${srcdir}/vfs-ino.patch"
9393

9494
# add BFQ scheduler
9595
#patch -Np1 -i "${srcdir}/0001-block-cgroups-kconfig-build-bits-for-BFQ-${_bfq}.patch"
@@ -109,7 +109,7 @@ prepare() {
109109
cat "${srcdir}/config" > ./.config
110110
fi
111111

112-
#cat "${srcdir}/config.aufs" >> ./.config
112+
cat "${srcdir}/config.aufs" >> ./.config
113113

114114
if [ "${_kernelname}" != "" ]; then
115115
sed -i "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"${_kernelname}\"|g" ./.config

‎linux44/PKGBUILD

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ _basekernel=4.4
1313
_basever=44
1414
_aufs=20170206
1515
_bfq=v8r8
16-
_sub=52
16+
_sub=53
1717
pkgver=${_basekernel}.${_sub}
1818
pkgrel=1
1919
arch=('i686' 'x86_64')
@@ -52,7 +52,7 @@ source=(#"https://www.kernel.org/pub/linux/kernel/v4.x/linux-${_basekernel}.tar.
5252
'i8042-asus-notebook.patch::https://bugzilla.kernel.org/attachment.cgi?id=242001&action=diff&context=patch&collapsed=&headers=1&format=raw'
5353
)
5454
sha256sums=('5b8fc6519a737a5c809171e08225f050bf794f1f369c4c387ed3c8a89b1e995b'
55-
'96dfdcb3144509275bba3b3f8ad925b18f31a22dcab5abfd5a4b816977a4e8c3'
55+
'51e09e851c00f42e04f27a1848a06e93e9de9abd22da0408da4745b6d2edbbdb'
5656
'389490eab392a70e9882251df4eef4a55a64090c3f81ac554f620bcb16c5fbed'
5757
'4aba669ec026c2546a5c36432cb33a69994be141ead32b4e2aaa7c579970f3d4'
5858
'd1cecc720df66c70f43bdb86e0169d6b756161c870db8d7d39c32c04dc36ed36'

‎linux49/PKGBUILD

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ _basekernel=4.9
1313
_basever=50
1414
_aufs=20170206
1515
_bfq=v8r8
16-
_sub=13
16+
_sub=14
1717
#_git=69973b830859bc6529a7a0468ba0d80ee5117826
1818
pkgver=${_basekernel}.${_sub}
1919
pkgrel=1
@@ -56,7 +56,7 @@ source=("https://www.kernel.org/pub/linux/kernel/v4.x/linux-${_basekernel}.tar.x
5656
'0005-HID-multitouch-enable-Surface-3-Type-Cover-Pro-to-report-multitouch-data.patch::https://github.com/torvalds/linux/commit/0a76ac80e84d0be0aba24ab60ac3bc14bc49bbc9.patch'
5757
)
5858
sha256sums=('029098dcffab74875e086ae970e3828456838da6e0ba22ce3f64ef764f3d7f1a'
59-
'87a0f07dd393e2d08850f0536417d091684535ff0c8ab8f8d9aeab1db38589bf'
59+
'056282412144bdb8bb1d33a5b22a5605ed836a8061dfd65926e25ba71119d518'
6060
'19adb7cc873dc2855beb18563520c2bc0c82432892b5ab43d9b0139281fff1e7'
6161
'03b5d6f8de3006e3a1849dbc2228c1f6de42abf34fa0196ad50c1e0caf8e6627'
6262
'd1cecc720df66c70f43bdb86e0169d6b756161c870db8d7d39c32c04dc36ed36'

‎manjaro-system/PKGBUILD

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
pkgname=manjaro-system
88
pkgver=20$(date +%y%m%d)
9-
pkgrel=1
9+
pkgrel=2
1010
pkgdesc="Manjaro Linux System - Update script"
1111
arch=('any')
1212
url="http://www.manjaro.org"

‎manjaro-system/manjaro-update-system.sh

+33-6
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,39 @@ detectDE()
4141
}
4242

4343
post_upgrade() {
44-
45-
# fix issue with xorg-server
46-
if [ -L "/usr/lib/xorg/modules/extensions/libglx.xorg" ]; then
47-
msg "Removing depreciated libglx.so symlink ..."
48-
rm /usr/lib/xorg/modules/extensions/libglx.so &> /dev/null
49-
fi
44+
LIBGL_SYMLINK="/usr/lib/xorg/modules/extensions/libglx.xorg
45+
/usr/lib/libEGL.so.1.0.0
46+
/usr/lib/libEGL.so.1
47+
/usr/lib/libEGL.so
48+
/usr/lib/libGL.so.1.2.0
49+
/usr/lib/libGL.so.1
50+
/usr/lib/libGL.so
51+
/usr/lib/libGLESv1_CM.so.1.1.0
52+
/usr/lib/libGLESv1_CM.so.1
53+
/usr/lib/libGLESv1_CM.so
54+
/usr/lib/libGLESv2.so.2.0.0
55+
/usr/lib/libGLESv2.so.2
56+
/usr/lib/libGLESv2.so
57+
/usr/lib32/libEGL.so.1.0.0
58+
/usr/lib32/libEGL.so.1
59+
/usr/lib32/libEGL.so
60+
/usr/lib32/libGL.so.1.2.0
61+
/usr/lib32/libGL.so.1
62+
/usr/lib32/libGL.so
63+
/usr/lib32/libGLESv1_CM.so.1.1.0
64+
/usr/lib32/libGLESv1_CM.so.1
65+
/usr/lib32/libGLESv1_CM.so
66+
/usr/lib32/libGLESv2.so.2.0.0
67+
/usr/lib32/libGLESv2.so.2
68+
/usr/lib32/libGLESv2.so"
69+
70+
# fix issues with mesa-stack
71+
for i in $LIBGL_SYMLINK; do
72+
if [ -L "$i" ]; then
73+
msg "Removing depreciated $i symlink ..."
74+
rm $i &> /dev/null
75+
fi
76+
done
5077

5178
# avoid upgrading problems when lib32-libnm-glib46 is installed and lib32-libnm-glib is not, and we want to install lib32-libnm-glib.
5279
# ldconfig creates varous symlink in /usr/lib32/ from the lib32-libnm-glib46 packages but lib32-libnm-glib provides those files.

0 commit comments

Comments
 (0)