Hello community,
here is the log from the commit of package preload
checked in at Wed Jul 4 23:48:49 CEST 2007.
--------
--- preload/preload.changes 2007-06-21 11:23:03.000000000 +0200
+++ /mounts/work_src_done/STABLE/preload/preload.changes 2007-07-04 16:26:43.702596000 +0200
@@ -1,0 +2,5 @@
+Wed Jul 4 16:26:27 CEST 2007 - coolo@suse.de
+
+- adding experimental support for ext2remapper
+
+-------------------------------------------------------------------
Old:
----
rpmlintrc
New:
----
blktrace.tar.bz2
boot.blktrace
bootfaster.diff
ext3remapper-r129.diff
ext3remapper-r129.tar.bz2
preload-rpmlintrc
stopblktrace
waitfornm
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ preload.spec ++++++
--- /var/tmp/diff_new_pack.v31736/_old 2007-07-04 23:47:45.000000000 +0200
+++ /var/tmp/diff_new_pack.v31736/_new 2007-07-04 23:47:45.000000000 +0200
@@ -12,14 +12,23 @@
Name: preload
Version: 0.2
-Release: 76
+Release: 78
Summary: Preloads Files into System Cache for Faster Booting
-License: GNU General Public License (GPL)
+License: GPL v2 or later
Group: System/Boot
Source0: preload.tar.bz2
-Source1: rpmlintrc
+Source1: %name-rpmlintrc
+# git clone git://git.kernel.org/pub/scm/linux/kernel/git/axboe/blktrace.git
+Source2: blktrace.tar.bz2
+# svn export http://prefetch.googlecode.com/svn/trunk/ext3remapper
+Source3: ext3remapper-r129.tar.bz2
+Patch0: ext3remapper-r129.diff
+Source4: boot.blktrace
+Source5: stopblktrace
+Source6: bootfaster.diff
+Source7: waitfornm
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-BuildRequires: update-desktop-files
+BuildRequires: e2fsprogs-devel update-desktop-files
%description
Preload lists files to load into the system cache. This shortens system
@@ -35,13 +44,20 @@
Michael Matz
%prep
-%setup -n preload
+%setup -n preload -a 2 -a 3
+%patch -p0
%build
gcc $RPM_OPT_FLAGS -W -Wall -DUSE_FADVISE -o preload preload.c
gcc $RPM_OPT_FLAGS -W -Wall -o print-bmap print-bmap.c
+make -C blktrace "CC=gcc $RPM_OPT_FLAGS"
+make -C ext3remapper-r129 "CC=gcc $RPM_OPT_FLAGS"
%install
+make -C blktrace prefix=$RPM_BUILD_ROOT%_prefix install
+for prog in e2block2file e2remapblocks preloadblocks; do
+ install -m755 ext3remapper-r129/$prog $RPM_BUILD_ROOT%_bindir
+done
mkdir -p $RPM_BUILD_ROOT/sbin
mkdir -p $RPM_BUILD_ROOT/usr/bin
mkdir -p $RPM_BUILD_ROOT/usr/sbin
@@ -53,6 +69,9 @@
install -m 755 bootcache $RPM_BUILD_ROOT/usr/sbin
install -m 755 prepare_preload $RPM_BUILD_ROOT/usr/bin
install -m 755 init.earlyxdm $RPM_BUILD_ROOT/etc/init.d/earlyxdm
+install -m 755 %{S:4} $RPM_BUILD_ROOT/etc/init.d/
+install -m 755 %{S:5} $RPM_BUILD_ROOT/etc/init.d/
+install -m 755 %{S:7} $RPM_BUILD_ROOT/etc/init.d/
mkdir -p $RPM_BUILD_ROOT/etc
cp -a preload.d $RPM_BUILD_ROOT/etc
install -m 755 cron $RPM_BUILD_ROOT/etc/cron.daily/suse.de-update-preload
@@ -62,9 +81,12 @@
install -m 644 appspreload.desktop $RPM_BUILD_ROOT/opt/kde3/share/autostart
install -m 755 appspreloader.sh $RPM_BUILD_ROOT/usr/bin
%suse_update_desktop_file -n $RPM_BUILD_ROOT/opt/kde3/share/autostart/appspreload.desktop
+cp %{S:6} .
%post
%{fillup_and_insserv -npY preload earlyxdm}
+%{fillup_and_insserv -npY preload boot.blktrace}
+%{fillup_and_insserv -npY preload stopblktrace}
%postun
%{insserv_cleanup}
@@ -74,6 +96,7 @@
%files
%defattr(-, root, root)
+%doc bootfaster.diff
/sbin/*
/usr/sbin/*
/usr/bin/*
@@ -84,6 +107,8 @@
/opt/kde3
%changelog
+* Wed Jul 04 2007 - coolo@suse.de
+- adding experimental support for ext2remapper
* Thu Jun 21 2007 - coolo@suse.de
- remove kbd check - it's from the old earlykdm
* Wed Jun 20 2007 - coolo@suse.de
++++++ bootfaster.diff ++++++
--- /etc/init.d/halt.orig 2007-07-03 10:42:22.999334000 +0200
+++ /etc/init.d/halt 2007-07-03 10:44:14.486737000 +0200
@@ -189,6 +189,24 @@
# /dev/null
mount -no remount,ro / 2> /dev/null
sync
+if test -s /var/run/lastblks; then
+ ROOT_IS_EXT3=
+ while read where what type options rest ; do
+ case "$where" in
+ \#*|"") ;;
+ *) if test "$type" = "ext3" -a "$what" = "/"; then
+ ROOT_IS_EXT3=$where
+ break
+ fi ;;
+ esac
+ done < /etc/fstab
+ if test -n "$ROOT_IS_EXT3"; then
+ mount -n -t tmpfs none /dev/shm
+ e2block2file -n -t /var/run/lastblks "$ROOT_IS_EXT3" > /dev/shm/mapped
+ e2remapblocks /dev/shm/mapped "$ROOT_IS_EXT3"
+ umount /dev/shm
+ fi
+fi
# show "the system is down" message
test "$SPLASH" = yes && /sbin/splash -q -p 65535 -t "isdown"
--- /etc/insserv.conf.orig 2007-07-03 10:48:44.692262000 +0200
+++ /etc/insserv.conf 2007-07-03 10:48:33.907057000 +0200
@@ -6,7 +6,7 @@
#
# Low level networking (ethernet card)
#
-$network network +pcmcia +hotplug
+$network network +pcmcia +hotplug +waitfornm
#
# Named is operational
++++++ ext3remapper-r129.diff ++++++
diff -ru ext3remapper-r129.ori/e2block2file.c ext3remapper-r129/e2block2file.c
--- ext3remapper-r129.ori/e2block2file.c 2007-05-28 18:21:17.329998000 +0200
+++ ext3remapper-r129/e2block2file.c 2007-06-23 06:22:31.644743000 +0200
@@ -109,7 +109,7 @@
exit(1);
}
while (fscanf(block_file, "%Ld+%u", &blocknum, &len) == 2) {
- if (extent_count > allocated) {
+ if (extent_count >= allocated) {
allocated += BMAP_ALLOC_ENTRIES;
iextents = realloc(iextents,
sizeof(struct input_extent_map)*allocated);
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org