[debootstrap/el6] adding missing patch from fedora-devel and removing legacy patches

ksyz ksyz at fedoraproject.org
Wed Sep 7 18:09:42 UTC 2011


commit 8ba5d5385e17a2c08c7d0c63837b16183cba53b7
Author: Michal Ingeli <mi at v3.sk>
Date:   Wed Sep 7 20:09:15 2011 +0200

    adding missing patch from fedora-devel and removing legacy patches

 debootstrap-1.0.19-perms.patch                     |   28 --------------------
 ...0.19-devices.patch => debootstrap-devices.patch |   10 +++---
 2 files changed, 5 insertions(+), 33 deletions(-)
---
diff --git a/debootstrap-1.0.19-devices.patch b/debootstrap-devices.patch
similarity index 51%
rename from debootstrap-1.0.19-devices.patch
rename to debootstrap-devices.patch
index 5e20238..1152b96 100644
--- a/debootstrap-1.0.19-devices.patch
+++ b/debootstrap-devices.patch
@@ -1,7 +1,6 @@
-diff -ur debootstrap.orig/Makefile debootstrap/Makefile
---- debootstrap.orig/Makefile	2009-09-21 11:23:11.000000000 -0400
-+++ debootstrap/Makefile	2009-09-30 15:01:01.899945579 -0400
-@@ -40,6 +40,8 @@
+--- debootstrap.orig/Makefile
++++ debootstrap/Makefile
+@@ -34,7 +34,9 @@ devices.tar.gz:
  	mkdir -p dev
  	chown 0:0 dev
  	chmod 755 dev
@@ -10,4 +9,5 @@ diff -ur debootstrap.orig/Makefile debootstrap/Makefile
 +	$(MAKEDEV) -d dev -x console
 +	mknod dev/console c 5 1
  	tar cf - dev | gzip -9 >devices.tar.gz
- 	rm -rf dev
+ 	@if [ "$$(tar tvf devices.tar.gz | wc -l)" -lt 2 ]; then \
+ 		echo " ** devices.tar.gz is empty!" >&2; \


More information about the scm-commits mailing list