[rootfs-resize] add patch from bconoboy to fix some issues at runtime

Dennis Gilmore ausil at fedoraproject.org
Fri Jun 15 00:47:05 UTC 2012


commit cec679b7e20227c2672d5f5aa830444154614b3e
Author: Dennis Gilmore <dennis at ausil.us>
Date:   Thu Jun 14 19:46:46 2012 -0500

    add patch from bconoboy to fix some issues at runtime

 rootfs-resize.spec |   11 ++++++++---
 rr-count-dev.patch |   12 ++++++++++++
 2 files changed, 20 insertions(+), 3 deletions(-)
---
diff --git a/rootfs-resize.spec b/rootfs-resize.spec
index 7268f1a..d09f0bc 100644
--- a/rootfs-resize.spec
+++ b/rootfs-resize.spec
@@ -1,11 +1,12 @@
 Name:           rootfs-resize
 Version:        0.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Root partition re-sizing service for SD cards
 
 License:        GPLv2+
 URL:            http://zenit.senecac.on.ca/wiki/index.php/Fedora_ARM_Secondary_Architecture/rootfs-resize
 Source0:        http://scotland.proximity.on.ca/fedora-arm/%{name}/%{name}-%{version}.tgz
+Patch0:		rr-count-dev.patch
 
 # Note: This package is intended for use on ARM development boards,
 # but may be useful on other systems that run from SD cards.
@@ -25,6 +26,7 @@ systems running from SD cards.
 
 %prep
 %setup -q
+%patch0 -p1 
 
 %build
 echo "Nothing to do for build"
@@ -32,8 +34,8 @@ echo "Nothing to do for build"
 %install
 mkdir -p %{buildroot}/%{_unitdir}
 cp -p %{name}.service %{buildroot}/%{_unitdir}
-mkdir -p %{buildroot}/%{_bindir}
-cp -p %{name} %{buildroot}/%{_bindir}
+mkdir -p %{buildroot}/%{_sbindir}
+cp -p %{name} %{buildroot}/%{_sbindir}
 
 %files
 %doc COPYING README
@@ -65,6 +67,9 @@ if [ $1 -ge 1 ] ; then
 fi
 
 %changelog
+* Thu Jun 14 2012 Dennis Gilmore <dennis at ausil.us> - 0.3-3
+- add patch from bconoboy to fix some issues at runtime
+
 * Tue Jun 12 2012 Chris Tyler <chris at tylers.info> - 0.3-2
 - Script header version number fixup
 
diff --git a/rr-count-dev.patch b/rr-count-dev.patch
new file mode 100644
index 0000000..aa6b628
--- /dev/null
+++ b/rr-count-dev.patch
@@ -0,0 +1,12 @@
+--- rootfs-resize-0.3/rootfs-resize.orig	2012-06-14 16:58:18.057198425 -0700
++++ rootfs-resize-0.3/rootfs-resize	2012-06-14 16:58:47.336292141 -0700
+@@ -100,7 +100,7 @@
+ 
+ if [[ -f /.rootfs-repartition ]]; then
+ 
+-  if [[ "$(fdisk -l "$PDEV"|grep -c "^/dev/")" -ne 2 ]] ; then
++  if [[ "$(fdisk -l "$DEV"|grep -c "^/dev/")" -ne 2 ]] ; then
+     echo "$0: Partition count on $DEV is not 2, exiting."
+     exit 0
+   fi
+


More information about the scm-commits mailing list