Merge pull request #7820 from suvari/master

systemtap: version bump to 4.2

util/admin/systemtap/actions.py

@@ -10,6 +10,8 @@ from pisi.actionsapi import autotools
 from pisi.actionsapi import get
 
 def setup():
+    shelltools.unlink('pwd.lock')
+
     pisitools.dosed("configure.ac", "-Werror")
     pisitools.dosed("Makefile.am", "-Werror")
     autotools.autoreconf("-vfi")
@@ -17,6 +19,7 @@ def setup():
     autotools.configure("--enable-sqlite \
                          --enable-pie \
                          --disable-docs \
+                         --disable-static \
                          --disable-publican \
                          --disable-crash \
                          --disable-silent-rules \
@@ -36,9 +39,8 @@ def install():
     pisitools.dodir("/etc/stap-server/conf.d")
     pisitools.dodir("/etc/systemtap/conf.d")
     pisitools.dodir("/etc/systemtap/script.d")
-
-    pisitools.dobin("stap-prep")
     
+    pisitools.dobin("stap-prep")
     pisitools.domove("/var/run/stap-server", "/run/")
     pisitools.removeDir("var/run")
 

util/admin/systemtap/pspec.xml

@@ -12,32 +12,33 @@
         <IsA>app:console</IsA>
         <Summary>Instrumentation System</Summary>
         <Description>systemtap is an instrumentation system for systems running Linux 2.6. Developers can write instrumentation to collect data on the operation of the system.</Description>
-        <Archive sha1sum="cd4482870015b9429f9945588ea8846d4ace20d1" type="targz">ftp://sourceware.org/pub/systemtap/releases/systemtap-3.2.tar.gz</Archive>
+        <Archive sha1sum="efdb0d6e09ebdfa2acbfdb725542885db2195bb6" type="targz">https://sourceware.org/systemtap/ftp/releases/systemtap-4.2.tar.gz</Archive>
         <BuildDependencies>
+            <Dependency>bzip2</Dependency>
+            <Dependency>nss-devel</Dependency>
+            <Dependency>boost-devel</Dependency>
             <Dependency>python-devel</Dependency>
             <Dependency>sqlite-devel</Dependency>
-            <Dependency>readline-devel</Dependency>
+            <Dependency>json-c-devel</Dependency>
             <Dependency>ncurses-devel</Dependency>
             <Dependency>libxml2-devel</Dependency>
-            <Dependency>json-c-devel</Dependency>
-            <Dependency>boost-devel</Dependency>
-            <Dependency>nss-devel</Dependency>
+            <Dependency>readline-devel</Dependency>
+            <Dependency>elfutils-devel</Dependency>
             <Dependency>python-setuptools</Dependency>
         </BuildDependencies>
-        <Patches>
-        </Patches>
     </Source>
 
     <Package>
         <Name>systemtap</Name>
         <RuntimeDependencies>
+            <Dependency>elfutils</Dependency>
             <Dependency>readline</Dependency>
             <Dependency>sqlite</Dependency>
             <Dependency>python</Dependency>
+            <Dependency>libgcc</Dependency>
+            <Dependency>bzip2</Dependency>
             <Dependency>nspr</Dependency>
             <Dependency>nss</Dependency>
-            <Dependency>elfutils</Dependency>
-            <Dependency>libgcc</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="config">/etc</Path>
@@ -98,6 +99,13 @@
     </Package>
 
     <History>
+        <Update release="4">
+            <Date>2020-02-02</Date>
+            <Version>4.2</Version>
+            <Comment>Version bump</Comment>
+            <Name>Kamil Atlı</Name>
+            <Email>suvari@pisilinux.org</Email>
+        </Update>
         <Update release="3">
             <Date>2018-08-10</Date>
             <Version>3.2</Version>
@@ -120,4 +128,4 @@
             <Email>osman.erkan@pisilinux.org</Email>
         </Update>
     </History>
-</PISI>
+</PISI>