plymouth revert

system/boot/plymouth/actions.py

@@ -7,7 +7,6 @@
 from pisi.actionsapi import get
 from pisi.actionsapi import autotools
 from pisi.actionsapi import pisitools
-from pisi.actionsapi import mesontools
 from pisi.actionsapi import shelltools
 
 LOGO_FILE = "/usr/share/pixmaps/plymouth-pisilinux.png"
@@ -16,43 +15,35 @@ THEMEPATH = "/usr/share/plymouth/themes"
 def setup():
     pisitools.ldflags.add(" -ludev ")
     # /var/run => /run
-    # pisitools.dosed("configure.ac", "^(\s+plymouthruntimedir=)\$localstatedir(\/run\/plymouth)", r"\1\2")
-    # pisitools.dosed("src/Makefile.am", "^(plymouthdrundir\s=\s)\$\(localstatedir\)(\/run\/plymouth)", r"\1\2")
+    pisitools.dosed("configure.ac", "^(\s+plymouthruntimedir=)\$localstatedir(\/run\/plymouth)", r"\1\2")
+    pisitools.dosed("src/Makefile.am", "^(plymouthdrundir\s=\s)\$\(localstatedir\)(\/run\/plymouth)", r"\1\2")
 
-    # autotools.autoreconf("-fis")
+    autotools.autoreconf("-fis")
 
     # The end-start colors seems to be used by the two-step plugin
     # Disable nouveau drm renderer as it causes hangs when starting X server
-    mesontools.configure("-Dtracing=true \
-                         -Dlogo=%s \
-                         --bindir=/bin \
-                         --sbindir=/sbin \
-                         -Drelease-file=/etc/pisilinux-release \
-                         -Dbackground-color=0x000000 \
-                         -Dbackground-end-color-stop=0x000000 \
-                         -Dbackground-start-color-stop=0x000000 \
-                         -Dboot-tty=/dev/tty7 \
-                         -Dshutdown-tty=/dev/tty1 \
-                         -Dsystemd-integration=false  \
-                         " % LOGO_FILE)
-
-    # --with-system-root-install \
-    # --with-log-viewer \
-    # --disable-libdrm_nouveau \
-    # --disable-tests \
-    # --disable-static \
-    # --enable-gdm-transition \
-    # --without-rhgb-compat-link
+    autotools.configure("--enable-tracing \
+                         --with-logo=%s \
+                         --with-release-file=/etc/pisilinux-release \
+                         --with-background-color=0x000000 \
+                         --with-background-end-color-stop=0x000000 \
+                         --with-background-start-color-stop=0x000000 \
+                         --with-system-root-install \
+                         --with-boot-tty=/dev/tty7 \
+                         --with-shutdown-tty=/dev/tty1 \
+                         --with-log-viewer \
+                         --disable-libdrm_nouveau \
+                         --disable-systemd-integration  \
+                         --disable-tests \
+                         --disable-static \
+                         --enable-gdm-transition \
+                         --without-rhgb-compat-link" % LOGO_FILE)
 
 def build():
-    mesontools.build()
-    # autotools.make()
-
+    autotools.make()
 
 def install():
-    pisitools.insinto("/usr/share/pixmaps", "plymouth-pisilinux.png")
-    mesontools.install()
-    # autotools.rawInstall("DESTDIR='%s'" % get.installDIR())
+    autotools.rawInstall("DESTDIR='%s'" % get.installDIR())
 
     # Copy necessary files for Charge theme
     pisitools.dodir("%s/charge" % THEMEPATH)
@@ -65,4 +56,4 @@ def install():
     # Generate initramfs filelist
     #shelltools.system("./generate-flist %s" % get.installDIR())
 
-    pisitools.dodoc("COPYING", "README*", "AUTHORS")
+    pisitools.dodoc("TODO", "COPYING", "README", "ChangeLog")