From 6725c49e1020452a0b97ae5d6d104bca7b6bb85b Mon Sep 17 00:00:00 2001 From: Rmys Date: Mon, 5 Nov 2018 13:10:50 +0300 Subject: [PATCH 1/7] xcb-proto --- system/devel/xcb-proto/pspec.xml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/system/devel/xcb-proto/pspec.xml b/system/devel/xcb-proto/pspec.xml index 22509323..5be6c99d 100644 --- a/system/devel/xcb-proto/pspec.xml +++ b/system/devel/xcb-proto/pspec.xml @@ -12,7 +12,7 @@ data XCB protocol descriptions XCB is a project to enable efficient language bindings to the X11 protocol. This package contains the protocol descriptions themselves. Language bindings use these protocol descriptions to generate code for marshalling the protocol. - https://xcb.freedesktop.org/dist/xcb-proto-1.12.tar.bz2 + https://xcb.freedesktop.org/dist/xcb-proto-1.13.tar.bz2 libxml2 @@ -29,6 +29,13 @@ + + 2018-11-05 + 1.13 + Version Bump + PisiLinux Community + admin@pisilinux.org + 2018-07-15 1.12 From 2c40dd6bd2d9aee83a19ac3fb71cc2046b0e86ec Mon Sep 17 00:00:00 2001 From: Rmys Date: Tue, 6 Nov 2018 02:57:12 +0300 Subject: [PATCH 2/7] libunwind:rebuild 32 bit --- system/base/libunwind/actions.py | 25 +++++++++++++++++++++++-- system/base/libunwind/pspec.xml | 24 +++++++++++++++++++++++- 2 files changed, 46 insertions(+), 3 deletions(-) diff --git a/system/base/libunwind/actions.py b/system/base/libunwind/actions.py index 9f89269e..6b11f28f 100644 --- a/system/base/libunwind/actions.py +++ b/system/base/libunwind/actions.py @@ -6,14 +6,31 @@ from pisi.actionsapi import autotools from pisi.actionsapi import pisitools +from pisi.actionsapi import shelltools from pisi.actionsapi import get def setup(): pisitools.flags.add("-U_FORTIFY_SOURCE") autotools.autoreconf("-vfi") - autotools.configure("--enable-shared \ - --disable-static") + + options = "--enable-shared \ + --disable-static \ + " + + if get.buildTYPE() == "emul32": + shelltools.export("CC", "%s -m32" % get.CC()) + shelltools.export("CXX", "%s -m32" % get.CXX()) + shelltools.export("PKG_CONFIG_PATH", "/usr/lib32/pkgconfig") + + options += "--build=i686-pc-linux-gnu \ + --host=i686-pc-linux-gnu \ + --prefix=/emul32 \ + --libdir=/usr/lib32 \ + --disable-documentation \ + " + + autotools.configure(options) pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ") @@ -27,6 +44,10 @@ def build(): def install(): autotools.rawInstall("DESTDIR=%s" % get.installDIR()) + + if get.buildTYPE() == "emul32": + pisitools.insinto("/usr/include", "include/libunwind-x86.h") + return # FIXME: Fedora removes it, Suse keeps it, breaks samba build, investigate further pisitools.remove("/usr/lib/libunwind*.a") diff --git a/system/base/libunwind/pspec.xml b/system/base/libunwind/pspec.xml index bfb8b476..12966c0b 100644 --- a/system/base/libunwind/pspec.xml +++ b/system/base/libunwind/pspec.xml @@ -42,8 +42,30 @@ /usr/lib/pkgconfig - + + libunwind-32bit + emul32 + 32-bit shared libraries for libunwind + emul32 + + + + libunwind + xz-32bit + + + /usr/lib32 + + + + + 2018-11-06 + 1.1 + Rebuild libunwind-32bit + Mustafa Cinasal + muscnsl@gmail.com + 2018-07-15 1.1 From 88b7914ba367ec2eacb172c922a8a7e168a0dcff Mon Sep 17 00:00:00 2001 From: Rmys Date: Tue, 6 Nov 2018 10:33:40 +0300 Subject: [PATCH 3/7] libunwind-32bit --- system/base/libunwind/pspec.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/system/base/libunwind/pspec.xml b/system/base/libunwind/pspec.xml index 12966c0b..90b25a50 100644 --- a/system/base/libunwind/pspec.xml +++ b/system/base/libunwind/pspec.xml @@ -40,6 +40,7 @@ /usr/include /usr/lib/pkgconfig + /usr/lib32/pkgconfig From 4cadf9b10ce7ab02e76b8c7ab8597ad2ec3ccce7 Mon Sep 17 00:00:00 2001 From: Rmys Date: Tue, 6 Nov 2018 11:06:51 +0300 Subject: [PATCH 4/7] libunwind-32bit --- system/base/libunwind/pspec.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/system/base/libunwind/pspec.xml b/system/base/libunwind/pspec.xml index 90b25a50..2fda6e0e 100644 --- a/system/base/libunwind/pspec.xml +++ b/system/base/libunwind/pspec.xml @@ -49,6 +49,7 @@ 32-bit shared libraries for libunwind emul32 + xz-32bit libunwind From 1725db6e4982b46eb86a06ca3b64c257770d3e06 Mon Sep 17 00:00:00 2001 From: Rmys Date: Tue, 6 Nov 2018 18:03:53 +0300 Subject: [PATCH 5/7] virtualbox:ver.bump --- kernel/drivers/module-virtualbox-guest/pspec.xml | 9 ++++++++- kernel/drivers/module-virtualbox/pspec.xml | 9 ++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/kernel/drivers/module-virtualbox-guest/pspec.xml b/kernel/drivers/module-virtualbox-guest/pspec.xml index 88d3e530..36f1179c 100644 --- a/kernel/drivers/module-virtualbox-guest/pspec.xml +++ b/kernel/drivers/module-virtualbox-guest/pspec.xml @@ -12,7 +12,7 @@ driver Kernel modules for VirtualBox guest machines This package provides the kernel modules needed for mouse integration and shared folder support between VirtualBox host and guest systems. - https://sourceforge.net/projects/pisilinux/files/source/module-virtualbox-guest-5.2.18.tar.xz + https://sourceforge.net/projects/pisilinux/files/source/module-virtualbox-guest-5.2.20.tar.xz kernel-module-headers @@ -52,6 +52,13 @@ + + 2018-11-06 + 5.2.20 + Rebuild + Ertuğrul Erata + ertugrulerata@gmail.com + 2018-10-05 5.2.18 diff --git a/kernel/drivers/module-virtualbox/pspec.xml b/kernel/drivers/module-virtualbox/pspec.xml index 4b8c87ae..2f42c867 100644 --- a/kernel/drivers/module-virtualbox/pspec.xml +++ b/kernel/drivers/module-virtualbox/pspec.xml @@ -12,7 +12,7 @@ driver Kernel modules for VirtualBox This package provides the kernel support for VirtualBox. - https://sourceforge.net/projects/pisilinux/files/source/module-virtualbox-5.2.18.tar.xz + https://sourceforge.net/projects/pisilinux/files/source/module-virtualbox-5.2.20.tar.xz kernel-module-headers @@ -50,6 +50,13 @@ + + 2018-11-06 + 5.2.20 + Rebuild + Ertuğrul Erata + ertugrulerata@gmail.com + 2018-10-05 5.2.18 From 8c13db490352524c05ed2f2e179d34baea04e172 Mon Sep 17 00:00:00 2001 From: Rmys Date: Wed, 7 Nov 2018 00:44:04 +0300 Subject: [PATCH 6/7] module-virtualbox-guest --- .../files/vboxsf-make.patch | 39 +++++++++++++++++++ .../drivers/module-virtualbox-guest/pspec.xml | 3 ++ 2 files changed, 42 insertions(+) create mode 100644 kernel/drivers/module-virtualbox-guest/files/vboxsf-make.patch diff --git a/kernel/drivers/module-virtualbox-guest/files/vboxsf-make.patch b/kernel/drivers/module-virtualbox-guest/files/vboxsf-make.patch new file mode 100644 index 00000000..bd4b83c7 --- /dev/null +++ b/kernel/drivers/module-virtualbox-guest/files/vboxsf-make.patch @@ -0,0 +1,39 @@ +diff -Nuar a/Makefile b/Makefile +--- a/Makefile 2018-10-15 17:25:07.000000000 +0300 ++++ b/Makefile 2018-08-14 14:38:32.000000000 +0300 +@@ -25,7 +25,7 @@ + + KBUILD_VERBOSE = + +-vboxguest: ++all: + @echo "=== Building 'vboxguest' module ===" + @$(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxguest + @if [ -f vboxguest/vboxguest.ko ]; then \ +@@ -34,8 +34,6 @@ + cp vboxguest/vboxguest.o .; \ + fi + @echo +- +-vboxsf: vboxguest + @if [ -d vboxsf ]; then \ + if [ -f vboxguest/Module.symvers ]; then \ + cp vboxguest/Module.symvers vboxsf; \ +@@ -49,8 +47,6 @@ + fi; \ + echo; \ + fi +- +-vboxvideo: + @if [ -d vboxvideo ]; then \ + if [ -f vboxguest/Module.symvers ]; then \ + cp vboxguest/Module.symvers vboxvideo; \ +@@ -65,8 +61,6 @@ + echo; \ + fi + +-all: vboxguest vboxsf vboxvideo +- + install: + @$(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxguest install + @if [ -d vboxsf ]; then \ diff --git a/kernel/drivers/module-virtualbox-guest/pspec.xml b/kernel/drivers/module-virtualbox-guest/pspec.xml index 36f1179c..aaeabd2b 100644 --- a/kernel/drivers/module-virtualbox-guest/pspec.xml +++ b/kernel/drivers/module-virtualbox-guest/pspec.xml @@ -16,6 +16,9 @@ kernel-module-headers + + vboxsf-make.patch + From e58511274ca134488a30fc2fd2b68185813213c5 Mon Sep 17 00:00:00 2001 From: Rmys Date: Wed, 7 Nov 2018 10:36:43 +0300 Subject: [PATCH 7/7] module-virtualbox-guest:vboxsf --- kernel/drivers/module-virtualbox-guest/actions.py | 1 + kernel/drivers/module-virtualbox-guest/pspec.xml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/kernel/drivers/module-virtualbox-guest/actions.py b/kernel/drivers/module-virtualbox-guest/actions.py index 93060ba3..f321d3cc 100644 --- a/kernel/drivers/module-virtualbox-guest/actions.py +++ b/kernel/drivers/module-virtualbox-guest/actions.py @@ -11,6 +11,7 @@ KDIR = kerneltools.getKernelVersion() def build(): autotools.make("KERN_DIR=/lib/modules/%s/build" % KDIR) + autotools.make("-C vboxsf KERN_DIR=/lib/modules/%s/build" % KDIR) autotools.make("-C vboxvideo KERN_DIR=/lib/modules/%s/build" % KDIR) def install(): diff --git a/kernel/drivers/module-virtualbox-guest/pspec.xml b/kernel/drivers/module-virtualbox-guest/pspec.xml index aaeabd2b..8058df3d 100644 --- a/kernel/drivers/module-virtualbox-guest/pspec.xml +++ b/kernel/drivers/module-virtualbox-guest/pspec.xml @@ -17,7 +17,7 @@ kernel-module-headers - vboxsf-make.patch +