summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
Diffstat (limited to 'source')
-rwxr-xr-xsource/a/eudev/eudev.SlackBuild6
-rwxr-xr-xsource/a/grub/grub.SlackBuild5
-rw-r--r--source/a/grub/grub.binutils.fix.diff20
-rwxr-xr-xsource/x/xterm/xterm.SlackBuild2
4 files changed, 30 insertions, 3 deletions
diff --git a/source/a/eudev/eudev.SlackBuild b/source/a/eudev/eudev.SlackBuild
index cc94d761..2615147a 100755
--- a/source/a/eudev/eudev.SlackBuild
+++ b/source/a/eudev/eudev.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=eudev
VERSION=${VERSION:-$(echo eudev-*.tar.?* | cut -d - -f 2 | rev | cut -f 3- -d . | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
@@ -76,6 +76,10 @@ zcat $CWD/60-cdrom_id.rules.diff.gz | patch -p1 --verbose || exit 1
# See: https://bugs.kde.org/show_bug.cgi?id=387454
zcat $CWD/eudev.ignore_bind_unbind_events.diff.gz | patch -p1 --verbose || exit 1
+# Get rid of unneeded groups that were added by systemd:
+sed -i 's/GROUP="render", //' rules/50-udev-default.rules
+sed -i 's/GROUP="kvm", //' rules/50-udev-default.rules
+
./configure \
--prefix=/usr \
--with-rootprefix=/ \
diff --git a/source/a/grub/grub.SlackBuild b/source/a/grub/grub.SlackBuild
index 9ece0d82..4b00083b 100755
--- a/source/a/grub/grub.SlackBuild
+++ b/source/a/grub/grub.SlackBuild
@@ -28,7 +28,7 @@ PKGNAM=grub
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
# Better to use _ than ~ in the package filenames version:
PKGVER=$(echo $VERSION | tr '~' '_')
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-4}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
@@ -118,6 +118,9 @@ zcat $CWD/0198-align-struct-efi_variable-better.patch.gz | patch -p1 --verbose |
# Fix compatibility with recent xfsprogs:
zcat $CWD/grub.xfs.sparse.inodes.patch.gz | patch -p1 --verbose || exit 1
+# Fix breakage when compiled with recent binutils:
+zcat $CWD/grub.binutils.fix.diff.gz | patch -p1 --verbose || exit 1
+
build_grub() {
EFI_DO="$*"
# Configure:
diff --git a/source/a/grub/grub.binutils.fix.diff b/source/a/grub/grub.binutils.fix.diff
new file mode 100644
index 00000000..b23cb1b6
--- /dev/null
+++ b/source/a/grub/grub.binutils.fix.diff
@@ -0,0 +1,20 @@
+--- ./util/grub-mkimagexx.c.orig 2017-04-24 04:16:00.000000000 -0500
++++ ./util/grub-mkimagexx.c 2018-09-22 13:35:33.089870295 -0500
+@@ -832,6 +832,7 @@
+ break;
+
+ case R_X86_64_PC32:
++ case R_X86_64_PLT32:
+ {
+ grub_uint32_t *t32 = (grub_uint32_t *) target;
+ *t32 = grub_host_to_target64 (grub_target_to_host32 (*t32)
+--- ./util/grub-module-verifier.c.orig 2017-04-24 04:16:00.000000000 -0500
++++ ./util/grub-module-verifier.c 2018-09-22 13:36:05.328867627 -0500
+@@ -19,6 +19,7 @@
+ -1
+ }, (int[]){
+ R_X86_64_PC32,
++ R_X86_64_PLT32,
+ -1
+ }
+ },
diff --git a/source/x/xterm/xterm.SlackBuild b/source/x/xterm/xterm.SlackBuild
index 9d065de9..9085c7f9 100755
--- a/source/x/xterm/xterm.SlackBuild
+++ b/source/x/xterm/xterm.SlackBuild
@@ -141,7 +141,7 @@ fi
# Add a documentation directory:
mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
cp -a \
- AAA_README_VMS.txt INSTALL MANIFEST README* \
+ INSTALL* NEWS* *README* THANKS* \
$PKG/usr/doc/${PKGNAM}-$VERSION
mkdir -p $PKG/install