* [IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 34bacb2ec4af1049a72773bfb558504e696195be
@ 2012-04-22 19:32 git
0 siblings, 0 replies; only message in thread
From: git @ 2012-04-22 19:32 UTC (permalink / raw)
To: ipfire-scm
[-- Attachment #1: Type: text/plain, Size: 17485 bytes --]
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 3.x development tree".
The branch, master has been updated
via 34bacb2ec4af1049a72773bfb558504e696195be (commit)
via dfab83a012d1a8f2fc0bde5ec246e1fcfd3ab512 (commit)
via 3d794248f91d5238aaf9bc06f63aa275449b0e52 (commit)
via c24352790efd8bb2933f4035aec9990e42f4b800 (commit)
from 6208ca279f60ce3969d44ba3044a2f48c9e748fc (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 34bacb2ec4af1049a72773bfb558504e696195be
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Apr 22 21:31:29 2012 +0200
grub: Move everything to /usr and come with better defaults.
commit dfab83a012d1a8f2fc0bde5ec246e1fcfd3ab512
Merge: c243527 3d79424
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Apr 22 20:47:46 2012 +0200
Merge remote-tracking branch 'stevee/authconfig'
commit 3d794248f91d5238aaf9bc06f63aa275449b0e52
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Sun Apr 22 19:21:48 2012 +0200
authconfig: Add LDFLAGS to link against -lresolv.
The python module had unresolved symbols which are provided from
libresolv.so.2 from the glibc package but hasn't been linked against it.
So we have to do the correct linking manually.
Fixes #10099.
commit c24352790efd8bb2933f4035aec9990e42f4b800
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Apr 22 17:16:17 2012 +0200
plymouth: Import of package.
This adds a nice bootscreen to the IPFire system.
-----------------------------------------------------------------------
Summary of changes:
authconfig/authconfig.nm | 5 +-
grub/default/grub | 35 +--
grub/grub.nm | 11 +-
plymouth/boot-duration | 39 +++
...lymouth-0.8.0-everything-is-better-in-red.patch | 16 +
plymouth/patches/plymouth-no-gtk.patch | 32 ++
plymouth/plymouth-update-initrd | 2 +
plymouth/plymouth.nm | 306 ++++++++++++++++++++
8 files changed, 412 insertions(+), 34 deletions(-)
create mode 100644 plymouth/boot-duration
create mode 100644 plymouth/patches/plymouth-0.8.0-everything-is-better-in-red.patch
create mode 100644 plymouth/patches/plymouth-no-gtk.patch
create mode 100644 plymouth/plymouth-update-initrd
create mode 100644 plymouth/plymouth.nm
Difference in files:
diff --git a/authconfig/authconfig.nm b/authconfig/authconfig.nm
index 2bb161a..e23aa66 100644
--- a/authconfig/authconfig.nm
+++ b/authconfig/authconfig.nm
@@ -5,7 +5,7 @@
name = authconfig
version = 6.2.2
-release = 1
+release = 2
groups = System/Base
url = https://fedorahosted.org/authconfig
@@ -28,6 +28,9 @@ build
python-devel
end
+ # Manually link against libresolv.
+ export LDFLAGS += -lresolv
+
configure_options += \
--sysconfdir=/etc \
--localstatedir=/var \
diff --git a/grub/default/grub b/grub/default/grub
index fe159a6..0fe9d7c 100644
--- a/grub/default/grub
+++ b/grub/default/grub
@@ -1,27 +1,8 @@
-# If you change this file, run 'update-grub' afterwards to update
-# /boot/grub/grub.cfg.
-
-GRUB_DEFAULT=0
-GRUB_HIDDEN_TIMEOUT=0
-GRUB_HIDDEN_TIMEOUT_QUIET=true
-GRUB_TIMEOUT=10
-GRUB_DISTRIBUTOR=$(sed -n 's/\([A-Za-z0-9]*\) release \([0-9A-Za-z\.\-]*\) .*/\1 \2/p' < /etc/system-release)
-GRUB_CMDLINE_LINUX_DEFAULT="quiet selinux=0"
-GRUB_CMDLINE_LINUX=""
-
-# Uncomment to disable graphical terminal (grub-pc only)
-#GRUB_TERMINAL=console
-
-# The resolution used on graphical terminal
-# note that you can use only modes which your graphic card supports via VBE
-# you can see them in real GRUB with the command `vbeinfo'
-#GRUB_GFXMODE=640x480
-
-# Uncomment if you don't want GRUB to pass "root=UUID=xxx" parameter to Linux
-#GRUB_DISABLE_LINUX_UUID=true
-
-# Uncomment to disable generation of recovery mode menu entries
-GRUB_DISABLE_LINUX_RECOVERY="true"
-
-# Uncomment to get a beep at grub start
-#GRUB_INIT_TUNE="480 440 1"
+GRUB_TIMEOUT=5
+GRUB_DISTRIBUTOR="$(sed 's, release .*$,,g' /etc/system-release)"
+GRUB_DEFAULT=saved
+GRUB_SAVEDEFAULT=true
+# GRUB_TERMINAL="serial console"
+# GRUB_SERIAL_COMMAND="serial --unit=0 --speed=115200"
+GRUB_CMDLINE_LINUX="quiet rhgb"
+GRUB_DISABLE_RECOVERY="true"
diff --git a/grub/grub.nm b/grub/grub.nm
index b3a0c6d..e9ec433 100644
--- a/grub/grub.nm
+++ b/grub/grub.nm
@@ -5,7 +5,7 @@
name = grub
version = 1.99
-release = 5
+release = 6
sup_arches = x86_64 i686
groups = System/Boot
@@ -56,7 +56,6 @@ build
configure_options += \
--target="i386" \
- --sbindir=/sbin \
--datadir=%{libdir} \
--with-platform=pc \
--program-transform-name=s,grub,grub, \
@@ -101,7 +100,7 @@ build
mv -v %{BUILDROOT}/etc/bash_completion.d/grub{,-efi}
sed -e "s,grub/grub-mkconfig_lib,grub-efi/grub-mkconfig_lib," \
- -i %{BUILDROOT}/sbin/grub-efi-mkconfig
+ -i %{BUILDROOT}%{sbindir}/grub-efi-mkconfig
install -m 755 -d %{BUILDROOT}/boot/efi/EFI/%{DISTRO_SNAME}/
install -d %{BUILDROOT}/boot/efi/EFI/%{DISTRO_SNAME}/grub-efi
@@ -168,9 +167,9 @@ packages
/boot/efi
/etc/bash_completion.d/grub-efi
/etc/grub-efi.cfg
- /sbin/grub-efi-*
- /usr/bin/grub-efi-*
- /usr/lib/grub-efi
+ %{sbindir}/grub-efi-*
+ %{bindir}/grub-efi-*
+ %{prefix}/lib/grub-efi
end
end
diff --git a/plymouth/boot-duration b/plymouth/boot-duration
new file mode 100644
index 0000000..7fe728c
--- /dev/null
+++ b/plymouth/boot-duration
@@ -0,0 +1,39 @@
+0.222:RCkernelparam
+0.223:RChostname
+0.238:RCmountfs
+0.275:RCswap
+0.330:microcode_ctl
+0.357:cpuspeed
+0.365:ip6tables
+0.380:iptables
+0.385:isdn
+0.504:auditd
+0.508:restorecond
+0.523:rsyslog
+0.530:irqbalance
+0.533:rpcbind
+0.549:nfslock
+0.561:mdmonitor
+0.563:rpcidmapd
+0.578:rpcgssd
+0.579:messagebus
+0.580:fuse
+0.594:netfs
+0.600:acpid
+0.611:haldaemon
+0.660:pcscd
+0.691:udev-post
+0.703:portreserve
+0.712:setroubleshoot
+0.749:bluetooth
+0.738:sshd
+0.763:ntpd
+0.807:sendmail
+0.876:crond
+0.902:kerneloops
+0.907:smolt
+0.915:atd
+0.927:avahi-daemon
+0.941:cups
+0.983:anacron
+0.992:local
diff --git a/plymouth/patches/plymouth-0.8.0-everything-is-better-in-red.patch b/plymouth/patches/plymouth-0.8.0-everything-is-better-in-red.patch
new file mode 100644
index 0000000..57635cd
--- /dev/null
+++ b/plymouth/patches/plymouth-0.8.0-everything-is-better-in-red.patch
@@ -0,0 +1,16 @@
+diff -up plymouth-0.8.0/src/plugins/splash/text/plugin.c.red plymouth-0.8.0/src/plugins/splash/text/plugin.c
+--- plymouth-0.8.0/src/plugins/splash/text/plugin.c.red 2009-11-19 14:40:24.000000000 -0500
++++ plymouth-0.8.0/src/plugins/splash/text/plugin.c 2009-11-19 14:41:40.000000000 -0500
+@@ -184,10 +184,10 @@ view_start_animation (view_t *view)
+ 0xffffff);
+ ply_terminal_set_color_hex_value (terminal,
+ PLY_TERMINAL_COLOR_BLUE,
+- 0x0073B3);
++ 0x880400);
+ ply_terminal_set_color_hex_value (terminal,
+ PLY_TERMINAL_COLOR_BROWN,
+- 0x00457E);
++ 0x880400);
+
+ ply_text_display_set_background_color (view->display,
+ PLY_TERMINAL_COLOR_BLACK);
diff --git a/plymouth/patches/plymouth-no-gtk.patch b/plymouth/patches/plymouth-no-gtk.patch
new file mode 100644
index 0000000..e9bf703
--- /dev/null
+++ b/plymouth/patches/plymouth-no-gtk.patch
@@ -0,0 +1,32 @@
+diff -Nur plymouth-0.8.4.orig/configure.ac plymouth-0.8.4/configure.ac
+--- plymouth-0.8.4.orig/configure.ac 2011-03-31 02:45:20.000000000 +0000
++++ plymouth-0.8.4/configure.ac 2011-11-04 10:12:55.436686905 +0000
+@@ -52,10 +52,6 @@
+ AC_SUBST(PANGO_LIBS)
+ fi
+
+-PKG_CHECK_MODULES(GTK, [gtk+-2.0 >= 2.12.0 ])
+-AC_SUBST(GTK_CFLAGS)
+-AC_SUBST(GTK_LIBS)
+-
+ AC_ARG_ENABLE(libdrm_intel, AS_HELP_STRING([--enable-libdrm_intel],[enable building with libdrm_intel support]),enable_libdrm_intel=$enableval,enable_libdrm_intel=yes)
+ AM_CONDITIONAL(ENABLE_LIBDRM_INTEL, [test "$enable_libdrm_intel" = yes])
+
+diff -Nur plymouth-0.8.4.orig/src/Makefile.am plymouth-0.8.4/src/Makefile.am
+--- plymouth-0.8.4.orig/src/Makefile.am 2011-03-31 02:48:57.000000000 +0000
++++ plymouth-0.8.4/src/Makefile.am 2011-11-04 10:13:42.687191109 +0000
+@@ -1,4 +1,4 @@
+-SUBDIRS = libply libply-splash-core libply-splash-graphics . plugins client viewer tests
++SUBDIRS = libply libply-splash-core libply-splash-graphics . plugins client tests
+ if ENABLE_UPSTART_MONITORING
+ SUBDIRS += upstart-bridge
+ endif
+diff -Nur plymouth-0.8.4.orig/src/plugins/renderers/Makefile.am plymouth-0.8.4/src/plugins/renderers/Makefile.am
+--- plymouth-0.8.4.orig/src/plugins/renderers/Makefile.am 2011-02-01 19:22:26.000000000 +0000
++++ plymouth-0.8.4/src/plugins/renderers/Makefile.am 2011-11-04 10:14:15.185225691 +0000
+@@ -1,3 +1,3 @@
+-SUBDIRS = frame-buffer x11 drm
++SUBDIRS = frame-buffer drm
+
+ MAINTAINERCLEANFILES = Makefile.in
+
diff --git a/plymouth/plymouth-update-initrd b/plymouth/plymouth-update-initrd
new file mode 100644
index 0000000..c07b561
--- /dev/null
+++ b/plymouth/plymouth-update-initrd
@@ -0,0 +1,2 @@
+#!/bin/bash
+/sbin/new-kernel-pkg --package kernel --mkinitrd --dracut --depmod --install $(uname -r)
diff --git a/plymouth/plymouth.nm b/plymouth/plymouth.nm
new file mode 100644
index 0000000..7d77e6f
--- /dev/null
+++ b/plymouth/plymouth.nm
@@ -0,0 +1,306 @@
+###############################################################################
+# IPFire.org - An Open Source Firewall Solution #
+# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
+###############################################################################
+
+name = plymouth
+version = 0.8.4
+release = 1
+
+groups = System/Base
+url = http://www.freedesktop.org/wiki/Software/Plymouth
+license = GPLv2+
+summary = Graphical Boot Animation and Logger.
+
+description
+ Plymouth provides an attractive graphical boot animation in
+ place of the text messages that normally get shown. Text
+ messages are instead redirected to a log file for viewing
+ after boot.
+end
+
+source_dl = http://www.freedesktop.org/software/plymouth/releases/
+sources = %{thisapp}.tar.bz2
+
+build
+ requires
+ autoconf
+ automake
+ cairo-devel
+ glib2-devel
+ pkgconfig(libdrm)
+ pkgconfig(libdrm_intel)
+ pkgconfig(libdrm_radeon)
+ pkgconfig(libdrm_nouveau)
+ libpng-devel
+ pango-devel
+ end
+
+ CFLAGS += -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include
+
+ configure_options += \
+ --libexecdir=/usr/lib \
+ --enable-tracing \
+ --disable-tests \
+ --with-logo=%{datadir}/pixmaps/system-logo-white.png \
+ --with-background-start-color-stop=0x880400 \
+ --with-background-end-color-stop=0x000000 \
+ --with-background-color=0x880400 \
+ --disable-gdm-transition \
+ --enable-systemd-integration \
+ --without-system-root-install \
+ --without-rhgb-compat-link \
+ --without-log-viewer
+
+ prepare_cmds
+ autoreconf -vfi
+ end
+
+ install_cmds
+ mkdir -pv %{BUILDROOT}%{datadir}/plymouth
+ mkdir -pv %{BUILDROOT}%{localstatedir}/lib/plymouth
+ cp -vf %{DIR_SOURCE}/boot-duration \
+ %{BUILDROOT}%{datadir}/plymouth/default-boot-duration
+ cp -vf %{DIR_SOURCE}/boot-duration \
+ %{BUILDROOT}%{localstatedir}/lib/plymouth
+
+ # Override plymouth-update-initrd to work dracut or mkinitrd
+ cp -vf %{DIR_SOURCE}/plymouth-update-initrd \
+ %{BUILDROOT}/usr/lib/plymouth/plymouth-update-initrd
+ chmod 755 %{BUILDROOT}/usr/lib/plymouth/plymouth-update-initrd
+ end
+end
+
+packages
+ package %{name}
+ groups += Base
+
+ prerequires
+ coreutils
+ end
+
+ requires
+ %{name}-libs = %{thisver}
+ %{name}-scripts = %{thisver}
+ %{name}-system-theme = %{thisver}
+ initscripts
+ end
+
+ configfiles
+ /etc/plymouth/plymouthd.conf
+ end
+
+ script postin
+ if [ ! -f "%{localstatedir}/lib/plymouth/boot-duration" ]; then
+ cp -f %{datadir}/plymouth/default-boot-duration \
+ %{localstatedir}/lib/plymouth/boot-duration
+ fi
+ end
+
+ script posttransin
+ /usr/lib/plymouth/plymouth-generate-initrd >/dev/null 2>&1
+ end
+
+ script postun
+ rm -f /boot/initrd-plymouth.img
+ end
+ end
+
+ package %{name}-libs
+ template LIBS
+ end
+
+ package %{name}-devel
+ template DEVEL
+
+ requires = plymouth-libs = %{thisver}
+ end
+
+ package %{name}-scripts
+ summary = Plymouth related scripts.
+ descrtiption
+ This package contains scripts that help to integrate
+ Plymouth with the system.
+ end
+
+ prerequires = /usr/bin/plymouth
+
+ requires
+ plymouth = %{thisver}
+ coreutils
+ cpio
+ dracut
+ findutils
+ grubby
+ gzip
+ end
+
+ files
+ %{sbindir}/plymouth-set-default-theme
+ %{sbindir}/plymouth-set-default-plugin
+ /usr/lib/plymouth/plymouth-update-initrd
+ /usr/lib/plymouth/plymouth-generate-initrd
+ /usr/lib/plymouth/plymouth-populate-initrd
+ end
+ end
+
+ package %{name}-plugin-label
+ summary = Plymouth label plugin.
+ description
+ This package contains the label plugin for Plymouth.
+ It provides the ability to render text on graphical boot
+ splashes using pango and cairo.
+ end
+
+ files
+ %{libdir}/plymouth/label.so
+ end
+ end
+
+ package %{name}-plugin-fade-throbber
+ summary = Plymouth fade-throbber plugin.
+ description
+ The package contains the fade-throbber plugin for Plymouth.
+ It features a centered image that fades in and out while
+ other images pulsate around during system boot up.
+ end
+
+ requires
+ %{name}-plugin-label
+ end
+
+ files
+ %{libdir}/plymouth/fade-throbber.so
+ end
+ end
+
+ package %{name}-plugin-throbgress
+ summary = Plymouth throbgress plugin.
+ description
+ This package contains the throbgress plugin for Plymouth.
+ It features a centered logo and animated spinner that spins
+ repeatedly while a progress bar advances at the bootom of the
+ screen.
+ end
+
+ requires
+ %{name}-plugin-label
+ end
+
+ files
+ %{libdir}/plymouth/throbgress.so
+ end
+ end
+
+ package %{name}-plugin-space-flares
+ summary = Plymouth space-flares plugin.
+ description
+ This package contains the space-flares plugin for Plymouth.
+ It features a corner image with animated flares.
+ end
+
+ requires
+ %{name}-plugin-label
+ end
+
+ files
+ %{libdir}/plymouth/space-flares.so
+ end
+ end
+
+ package %{name}-plugin-two-step
+ summary = Plymouth two-step plugin.
+ description
+ This package contains the two-step plugin for Plymouth.
+ It features a corner image with animated flares.
+ end
+
+ requires
+ %{name}-plugin-label
+ end
+
+ files
+ %{libdir}/plymouth/two-step.so
+ end
+ end
+
+ package %{name}-plugin-script
+ files
+ %{libdir}/plymouth/script.so
+ end
+ end
+
+ template THEME
+ summary = The plymouth "%{theme_name}" theme.
+ description
+ This package contains the "%{theme_name}" boot
+ splash theme for plymouth.
+ end
+
+ requires
+ %{name}-scripts = %{thisver}
+ end
+
+ files
+ %{datadir}/plymouth/themes/%{theme_name}
+ end
+
+ script postun
+ if [ "$(%{sbindir}/plymouth-set-default-theme)" = %{theme_name}" ]; then
+ %{sbindir}/plymouth-set-default-theme --reset
+ /usr/lib/plymouth/plymouth-generate-initrd
+ fi
+ end
+ end
+
+ package %{name}-theme-fade-in
+ template THEME
+ theme_name = fade-in
+
+ requires += %{name}-plugin-fade-throbber=%{thisver}
+ end
+
+ package %{name}-theme-spinner
+ template THEME
+ theme_name = spinner
+
+ requires += %{name}-plugin-two-step=%{thisver}
+ end
+
+ package %{name}-theme-spinfinity
+ template THEME
+ theme_name = spinfinity
+
+ requires += %{name}-plugin-throbgress=%{thisver}
+ end
+
+ package %{name}-theme-script
+ template THEME
+ theme_name = script
+
+ requires += %{name}-plugin-script=%{thisver}
+ end
+
+ package %{name}-theme-solar
+ template THEME
+ theme_name = solar
+
+ requires += %{name}-plugin-space-flares=%{thisver}
+ end
+
+ package %{name}-system-theme
+ summary = Plymouth default theme.
+ description
+ This metapackage tracks the current distribution default theme.
+ end
+
+ groups += Base
+
+ requires
+ system-logos
+ end
+
+ # Don't package any files.
+ files =
+ end
+end
hooks/post-receive
--
IPFire 3.x development tree
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2012-04-22 19:32 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-04-22 19:32 [IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 34bacb2ec4af1049a72773bfb558504e696195be git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox