plymouth:moved into main for pisi 2.0
This commit is contained in:
@@ -0,0 +1,116 @@
|
||||
#!/usr/bin/python
|
||||
# -*- coding: utf-8 -*-
|
||||
#
|
||||
# Copyright 2009-2010 TUBITAK/UEKAE
|
||||
# Licensed under the GNU General Public License, version 2.
|
||||
# See the file http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
|
||||
|
||||
from pisi.actionsapi import shelltools
|
||||
from pisi.actionsapi import autotools
|
||||
from pisi.actionsapi import pisitools
|
||||
from pisi.actionsapi import get
|
||||
|
||||
UCLIBC_ROOT = "/usr/lib/uClibc/"
|
||||
BUILD_FOR = ["system"]
|
||||
|
||||
LOGO_FILE = "/usr/share/pixmaps/plymouth-pisilinux.png"
|
||||
THEMEPATH = "/usr/share/plymouth/themes"
|
||||
|
||||
# The end-start colors seems to be used by the two-step plugin
|
||||
BASE_CONFIGURE_PARAMS = "--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 \
|
||||
--disable-tests \
|
||||
--disable-static \
|
||||
--disable-gdm-transition \
|
||||
--without-rhgb-compat-link \
|
||||
--without-gdm-autostart-file \
|
||||
--localstatedir=/var" % LOGO_FILE
|
||||
|
||||
|
||||
def setup():
|
||||
autotools.autoreconf("-fis")
|
||||
|
||||
for directory in BUILD_FOR:
|
||||
shelltools.makedirs(directory)
|
||||
shelltools.sym("../configure", "%s/configure" % directory)
|
||||
|
||||
def build_with_glibc():
|
||||
shelltools.cd("system")
|
||||
|
||||
autotools.configure(BASE_CONFIGURE_PARAMS)
|
||||
|
||||
autotools.make()
|
||||
shelltools.cd("..")
|
||||
|
||||
def build_with_uclibc():
|
||||
shelltools.export("CC", "%s-uclibc-gcc" % get.ARCH())
|
||||
shelltools.export("LD", "%s-uclibc-ld" % get.ARCH())
|
||||
|
||||
shelltools.cd("uclibc")
|
||||
|
||||
# Symlink zlib.h, zconf.h, xf86drm.h and xf86drmMode.h
|
||||
shelltools.makedirs("include")
|
||||
for header in ("zlib.h", "zconf.h", "xf86drm.h", "xf86drmMode.h"):
|
||||
shelltools.sym("/usr/include/%s" % header, "include/%s" % header)
|
||||
|
||||
shelltools.export("UCLIBC_GCC_INC", "-I%s/include" % get.curDIR())
|
||||
|
||||
autotools.configure("%s \
|
||||
--build=%s-pc-linux-uclibc \
|
||||
--libdir=%s/usr/lib \
|
||||
--prefix=%s/usr" % (BASE_CONFIGURE_PARAMS,
|
||||
get.ARCH(),
|
||||
UCLIBC_ROOT,
|
||||
UCLIBC_ROOT))
|
||||
|
||||
# Don't build these as they'll bring a lot of dependencies
|
||||
pisitools.dosed("src/Makefile", "viewer", "")
|
||||
pisitools.dosed("src/plugins/controls/Makefile", "label", "")
|
||||
|
||||
# Filter out generic targets
|
||||
pisitools.dosed("Makefile", "^SUBDIRS.*$", "SUBDIRS = src")
|
||||
|
||||
# Don't create /var/*/plymouth
|
||||
pisitools.dosed("src/Makefile", "^.*\$\(MAKE\).*install-data-hook", "")
|
||||
|
||||
# No need to x11 renderer in initramfs
|
||||
pisitools.dosed("src/plugins/renderers/Makefile", "^(SUBDIRS = .*) x11", "\\1")
|
||||
|
||||
autotools.make()
|
||||
shelltools.cd("..")
|
||||
|
||||
def build():
|
||||
build_with_glibc()
|
||||
|
||||
if "uclibc" in BUILD_FOR:
|
||||
build_with_uclibc()
|
||||
|
||||
def install():
|
||||
shelltools.touch("Makefile")
|
||||
if "uclibc" in BUILD_FOR:
|
||||
autotools.rawInstall("-C uclibc DESTDIR='%s'" % get.installDIR())
|
||||
|
||||
autotools.rawInstall("-C system DESTDIR='%s'" % get.installDIR())
|
||||
|
||||
# Copy necessary files for Charge theme
|
||||
pisitools.dodir("%s/charge" % THEMEPATH)
|
||||
for f in ("box", "bullet", "entry", "lock"):
|
||||
shelltools.copy("%s%s/glow/%s.png" % (get.installDIR(), THEMEPATH, f), "%s%s/charge/" % (get.installDIR(), THEMEPATH))
|
||||
|
||||
# Remove glow theme as it's premature
|
||||
pisitools.removeDir("/usr/share/plymouth/themes/glow")
|
||||
|
||||
# Remove fedora scripts
|
||||
pisitools.remove("/usr/libexec/plymouth/*")
|
||||
|
||||
# Generate initramfs filelist
|
||||
#shelltools.system("./generate-flist %s" % get.installDIR())
|
||||
|
||||
pisitools.dodoc("TODO", "COPYING", "README", "ChangeLog")
|
||||
@@ -0,0 +1,11 @@
|
||||
Index: plymouth-0.8.3_20101018/scripts/plymouth-set-default-theme.in
|
||||
===================================================================
|
||||
--- plymouth-0.8.3_20101018.orig/scripts/plymouth-set-default-theme.in
|
||||
+++ plymouth-0.8.3_20101018/scripts/plymouth-set-default-theme.in
|
||||
@@ -192,5 +192,5 @@ grep -q '^[[]Daemon[]]' ${PLYMOUTH_CONFD
|
||||
sed -i -e '/^Theme[[:blank:]]*=.*/d' ${PLYMOUTH_CONFDIR}/plymouthd.conf
|
||||
sed -i -e "s/^\([[]Daemon[]]\)\n*/\1\nTheme=${THEME_NAME}/" ${PLYMOUTH_CONFDIR}/plymouthd.conf
|
||||
|
||||
-[ $DO_INITRD_REBUILD -ne 0 ] && (${PLYMOUTH_LIBEXECDIR}/plymouth/plymouth-update-initrd)
|
||||
+[ $DO_INITRD_REBUILD -ne 0 ] && /sbin/mkinitramfs
|
||||
exit 0
|
||||
@@ -0,0 +1,31 @@
|
||||
--- plymouth-0.8.8/themes/Makefile.am 2012-10-26 18:01:45.000000000 +0300
|
||||
+++ plymouth-0.8.8-esk/themes/Makefile.am 2013-01-15 05:00:46.920416669 +0200
|
||||
@@ -1,2 +1,2 @@
|
||||
-SUBDIRS = spinfinity fade-in text details solar glow script spinner
|
||||
+SUBDIRS = spinfinity fade-in text details solar glow script spinner pisilinux
|
||||
MAINTAINERCLEANFILES = Makefile.in
|
||||
--- plymouth-0.8.8/src/plymouthd.conf 2012-10-26 18:01:45.000000000 +0300
|
||||
+++ plymouth-0.8.8-esk/src/plymouthd.conf 2013-01-15 05:04:34.391408794 +0200
|
||||
@@ -1,3 +1,3 @@
|
||||
# Administrator customizations go in this file
|
||||
#[Daemon]
|
||||
-#Theme=fade-in
|
||||
+#Theme=pisilinux
|
||||
--- plymouth-0.8.8/src/plymouthd.defaults 2012-10-26 18:01:45.000000000 +0300
|
||||
+++ plymouth-0.8.8-esk/src/plymouthd.defaults 2013-01-15 05:06:37.681404525 +0200
|
||||
@@ -1,4 +1,4 @@
|
||||
# Distribution defaults. Changes to this file will get overwritten during
|
||||
# upgrades.
|
||||
[Daemon]
|
||||
-Theme=spinner
|
||||
+Theme=pisilinux
|
||||
--- plymouth-0.8.8/configure.ac 2012-10-26 18:01:45.000000000 +0300
|
||||
+++ plymouth-0.8.8-esk/configure.ac 2013-01-15 05:08:54.923399773 +0200
|
||||
@@ -451,6 +451,7 @@
|
||||
themes/glow/Makefile
|
||||
themes/spinner/Makefile
|
||||
themes/script/Makefile
|
||||
+ themes/pisilinux/Makefile
|
||||
images/Makefile
|
||||
scripts/plymouth-generate-initrd
|
||||
scripts/plymouth-populate-initrd
|
||||
@@ -0,0 +1,25 @@
|
||||
0.447:start_udev
|
||||
0.475:check_root_filesystem
|
||||
0.487:mount_root_filesystem
|
||||
0.502:autoload_modules
|
||||
0.503:check_filesystems
|
||||
0.505:mount_local_filesystems
|
||||
0.509:enable_swap
|
||||
0.686:set_clock
|
||||
0.688:wait_for_udev_events
|
||||
0.710:boot_runlevel
|
||||
0.718:cleanup_tmp
|
||||
0.752:start_dbus
|
||||
0.784:default_runlevel
|
||||
0.795:rsyslog
|
||||
0.862:xdm
|
||||
0.867:audit
|
||||
0.874:gpm
|
||||
0.881:hal
|
||||
0.891:openssh
|
||||
0.902:pcsc_lite
|
||||
0.918:vixie_cron
|
||||
0.934:bluez
|
||||
0.952:ntpdate
|
||||
0.972:NetworkManager
|
||||
0.989:cups
|
||||
@@ -0,0 +1,15 @@
|
||||
Index: plymouth-0.8.3_20100929/src/libply/ply-logger.h
|
||||
===================================================================
|
||||
--- plymouth-0.8.3_20100929.orig/src/libply/ply-logger.h
|
||||
+++ plymouth-0.8.3_20100929/src/libply/ply-logger.h
|
||||
@@ -91,8 +91,8 @@ do
|
||||
ply_logger_flush (logger); \
|
||||
errno = _old_errno; \
|
||||
ply_logger_inject (logger, \
|
||||
- "[%s] %45.45s:" format "\r\n", \
|
||||
- __FILE__, __func__, ##args); \
|
||||
+ "" format "\n", \
|
||||
+ ##args); \
|
||||
ply_logger_flush (logger); \
|
||||
errno = _old_errno; \
|
||||
} \
|
||||
@@ -0,0 +1,74 @@
|
||||
#!/usr/bin/python
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
import os
|
||||
import sys
|
||||
|
||||
# Generate the list of files needed in initramfs for plymouth
|
||||
|
||||
exclude_list = (
|
||||
"/usr/bin/plymouth-log-viewer",
|
||||
"/usr/sbin/plymouth-set-default-theme",
|
||||
"/usr/lib/plymouth/renderers/x11.so",
|
||||
"/usr/lib/plymouth/label.so",
|
||||
)
|
||||
|
||||
paths = (
|
||||
"/usr/share/plymouth",
|
||||
"/usr/share/pixmaps",
|
||||
"/etc/plymouth",
|
||||
)
|
||||
|
||||
FILE_LIST = "lib/initramfs/plymouth.list"
|
||||
|
||||
def usage():
|
||||
print "%s <directory>" % sys.argv[0]
|
||||
return 1
|
||||
|
||||
def generate_needed_binary_list():
|
||||
binaries = set()
|
||||
executables = os.popen("find -type f -executable | cut -c2-").read().strip().split()
|
||||
executables = set(executables).difference(exclude_list)
|
||||
|
||||
for exe in executables:
|
||||
if exe.endswith(".la"):
|
||||
continue
|
||||
if ".so." in exe:
|
||||
# Add the libfoo.so.X symlink instead of libfoo.so.X.y.z
|
||||
symlink = exe.rsplit(".", 2)[0]
|
||||
if os.path.exists(symlink[1:]):
|
||||
binaries.add(symlink)
|
||||
continue
|
||||
|
||||
binaries.add(exe)
|
||||
|
||||
for exe in executables:
|
||||
for line in os.popen("ldd %s" % exe[1:]):
|
||||
if "=> /" in line:
|
||||
binaries.add(line.split()[2])
|
||||
elif line.strip().startswith("/"):
|
||||
binaries.add(line.strip().split()[0])
|
||||
|
||||
return binaries
|
||||
|
||||
def get_other_file_list():
|
||||
files = ["usr/share/pixmaps/plymouth-pisilinux.png", "usr/share/themes/charge/charge.plymouth"]
|
||||
for path in paths:
|
||||
files.extend(os.popen("find %s -type f" % path[1:]).read().strip().split())
|
||||
|
||||
return ["/%s" % f for f in files]
|
||||
|
||||
if __name__ == "__main__":
|
||||
|
||||
try:
|
||||
directory = sys.argv[1]
|
||||
except:
|
||||
sys.exit(usage())
|
||||
|
||||
os.chdir(directory)
|
||||
files = generate_needed_binary_list()
|
||||
files = files.union(get_other_file_list())
|
||||
|
||||
if not os.path.exists(os.path.dirname(FILE_LIST)):
|
||||
os.makedirs(os.path.dirname(FILE_LIST))
|
||||
open(FILE_LIST, "w").write("\n".join(sorted(files)))
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 16 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 14 KiB |
@@ -0,0 +1,35 @@
|
||||
/bin/plymouth
|
||||
/etc/plymouth/plymouthd.conf
|
||||
/lib/ld-linux-x86-64.so.2
|
||||
/lib/ld-linux.so.2
|
||||
/lib/libc.so.6
|
||||
/lib/libdl.so.2
|
||||
/lib/libm.so.6
|
||||
/lib/libply-splash-core.so.2
|
||||
/lib/libply.so.2
|
||||
/lib/libpthread.so.0
|
||||
/lib/librt.so.1
|
||||
/lib/libz.so.1
|
||||
/sbin/plymouthd
|
||||
/usr/lib/libdrm.so.2
|
||||
/usr/lib/libdrm_intel.so.1
|
||||
/usr/lib/libdrm_nouveau.so.2
|
||||
/usr/lib/libdrm_radeon.so.1
|
||||
/usr/lib/libkms.so.1
|
||||
/usr/lib/libply-boot-client.so.2
|
||||
/usr/lib/libply-splash-graphics.so.2
|
||||
/usr/lib/libpng16.so.16
|
||||
/usr/lib/liblzo2.so.2
|
||||
/usr/lib/plymouth/details.so
|
||||
/usr/lib/plymouth/fade-throbber.so
|
||||
/usr/lib/plymouth/renderers/drm.so
|
||||
/usr/lib/plymouth/renderers/frame-buffer.so
|
||||
/usr/lib/plymouth/script.so
|
||||
/usr/lib/plymouth/space-flares.so
|
||||
/usr/lib/plymouth/text.so
|
||||
/usr/lib/plymouth/throbgress.so
|
||||
/usr/lib/plymouth/two-step.so
|
||||
/usr/share/pixmaps/plymouth-pisilinux.png
|
||||
/usr/share/plymouth/plymouthd.defaults
|
||||
/usr/share/plymouth/themes/details/details.plymouth
|
||||
/usr/share/plymouth/themes/text/text.plymouth
|
||||
Reference in New Issue
Block a user