Merge branch 'master' of https://github.com/pisilinux/core into kernel_4_14

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():

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 \

kernel/drivers/module-virtualbox-guest/pspec.xml

@@ -12,10 +12,13 @@
         <IsA>driver</IsA>
         <Summary>Kernel modules for VirtualBox guest machines</Summary>
         <Description>This package provides the kernel modules needed for mouse integration and shared folder support between VirtualBox host and guest systems.</Description>
-        <Archive sha1sum="c81e49394bd5b4f8dc23a89bc866554662ebef45" type="tarxz">https://sourceforge.net/projects/pisilinux/files/source/module-virtualbox-guest-5.2.18.tar.xz</Archive>
+        <Archive sha1sum="c9a96e8e3946bc5996d83667c910e017d6a4a6cd" type="tarxz">https://sourceforge.net/projects/pisilinux/files/source/module-virtualbox-guest-5.2.20.tar.xz</Archive>
         <BuildDependencies>
             <Dependency version="4.14.73">kernel-module-headers</Dependency>
         </BuildDependencies>
+        <Patches>
+<!--             <Patch>vboxsf-make.patch</Patch> -->
+        </Patches>
     </Source>
 
     <Package>
@@ -52,6 +55,13 @@
     </Package>
 
     <History>
+        <Update release="34">
+            <Date>2018-11-06</Date>
+            <Version>5.2.20</Version>
+            <Comment>Rebuild</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+        </Update>
         <Update release="33">
             <Date>2018-10-05</Date>
             <Version>5.2.18</Version>

kernel/drivers/module-virtualbox/pspec.xml

@@ -12,7 +12,7 @@
         <IsA>driver</IsA>
         <Summary>Kernel modules for VirtualBox</Summary>
         <Description>This package provides the kernel support for VirtualBox.</Description>
-        <Archive sha1sum="734a9d48a9092610b14e750fd2957a2039fcdb8c" type="tarxz">https://sourceforge.net/projects/pisilinux/files/source/module-virtualbox-5.2.18.tar.xz</Archive>
+        <Archive sha1sum="7a2fdde3d8b7ef72fea632c872cdbd7050287e87" type="tarxz">https://sourceforge.net/projects/pisilinux/files/source/module-virtualbox-5.2.20.tar.xz</Archive>
         <BuildDependencies>
             <Dependency version="4.14.73">kernel-module-headers</Dependency>
         </BuildDependencies>
@@ -50,6 +50,13 @@
     </Package>
 
     <History>
+        <Update release="34">
+            <Date>2018-11-06</Date>
+            <Version>5.2.20</Version>
+            <Comment>Rebuild</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+        </Update>
         <Update release="33">
             <Date>2018-10-05</Date>
             <Version>5.2.18</Version>

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")

system/base/libunwind/pspec.xml

@@ -40,10 +40,34 @@
         <Files>
             <Path fileType="header">/usr/include</Path>
             <Path fileType="library">/usr/lib/pkgconfig</Path>
+            <Path fileType="library">/usr/lib32/pkgconfig</Path>
         </Files>
     </Package>
-
+    <Package>
+        <Name>libunwind-32bit</Name>
+        <PartOf>emul32</PartOf>
+        <Summary>32-bit shared libraries for libunwind</Summary>
+        <BuildType>emul32</BuildType>
+        <BuildDependencies>
+            <Dependency>xz-32bit</Dependency>
+        </BuildDependencies>
+        <RuntimeDependencies>
+            <Dependency release="current">libunwind</Dependency>
+            <Dependency>xz-32bit</Dependency>
+        </RuntimeDependencies>
+        <Files>
+            <Path fileType="library">/usr/lib32</Path>
+        </Files>
+    </Package>
+    
     <History>
+        <Update release="5">
+            <Date>2018-11-06</Date>
+            <Version>1.1</Version>
+            <Comment>Rebuild libunwind-32bit</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
+        </Update>
         <Update release="4">
             <Date>2018-07-15</Date>
             <Version>1.1</Version>

system/devel/xcb-proto/pspec.xml

@@ -12,7 +12,7 @@
         <IsA>data</IsA>
         <Summary>XCB protocol descriptions</Summary>
         <Description>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.</Description>
-        <Archive sha1sum="e93da374ecef9359370edc0160bcb8b2a2f7d9f6" type="tarbz2">https://xcb.freedesktop.org/dist/xcb-proto-1.12.tar.bz2</Archive>
+        <Archive sha1sum="f7fa35ab59af18cecadbe83fe705281dcfd82ffd" type="tarbz2">https://xcb.freedesktop.org/dist/xcb-proto-1.13.tar.bz2</Archive>
         <BuildDependencies>
             <Dependency>libxml2</Dependency>
         </BuildDependencies>
@@ -29,6 +29,13 @@
     </Package>
 
     <History>
+        <Update release="5">
+            <Date>2018-11-05</Date>
+            <Version>1.13</Version>
+            <Comment>Version Bump</Comment>
+            <Name>PisiLinux Community</Name>
+            <Email>admin@pisilinux.org</Email>
+        </Update>
         <Update release="4">
             <Date>2018-07-15</Date>
             <Version>1.12</Version>