Attachment #174573 for bug #212519

View | Details | Raw Unified | Return to bug 212519
Collapse All | Expand All

Lines 2-8 Link Here

(-)Makefile (-1 / +1 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= debootstrap	4	PORTNAME= debootstrap
5	PORTVERSION= 1.0.81	5	PORTVERSION= 1.0.82
6	CATEGORIES= sysutils	6	CATEGORIES= sysutils
7	MASTER_SITES= DEBIAN/pool/main/d/${PORTNAME}	7	MASTER_SITES= DEBIAN/pool/main/d/${PORTNAME}
8	DISTNAME= ${PORTNAME}_${PORTVERSION}	8	DISTNAME= ${PORTNAME}_${PORTVERSION}

Lines 1-2 Link Here

(-)distinfo (-2 / +3 lines)
1	SHA256 (debootstrap_1.0.81.tar.gz) = 344c7f841504c262d5088e9618f1d5f79bc122bffbb1dce2873c5e38029bdfb3	1	TIMESTAMP = 1473424128
2	SIZE (debootstrap_1.0.81.tar.gz) = 64394	2	SHA256 (debootstrap_1.0.82.tar.gz) = db0dfad15d5338a8cdbcc3bbfda8dc59c58edf07511303f31746ef6fcc733835
		3	SIZE (debootstrap_1.0.82.tar.gz) = 64344




--- Makefile.orig	2016-09-09 12:30:20 UTC
+++ Makefile
@@ -6,14 +6,12 @@ all:
 	rm -f devices.tar.gz
 	rm -rf dev
 
 clean:
 
-DSDIR=$(DESTDIR)/usr/share/debootstrap
+DSDIR=$(DESTDIR)%%DATADIR%%
 install:

-	chown root:root $(DESTDIR)/usr/sbin/debootstrap
-	chmod 0755 $(DESTDIR)/usr/sbin/debootstrap
+	sed 's/@VERSION@/$(VERSION)/g' debootstrap >$(DESTDIR)%%PREFIX%%/sbin/debootstrap
 
 ifeq ($(shell uname),Linux)
 	install -o root -g root -m 0644 devices.tar.gz $(DSDIR)/




--- debootstrap.orig	2016-09-09 12:32:15 UTC
+++ debootstrap
@@ -14,7 +14,7 @@ if [ -z "$DEBOOTSTRAP_DIR" ]; then
 	if [ -x /debootstrap/debootstrap ]; then
 		DEBOOTSTRAP_DIR=/debootstrap
 	else

 	fi
 fi
 
@@ -409,13 +409,7 @@ fi
 
 ###########################################################################
 

 	HOST_ARCH=`cat $DEBOOTSTRAP_DIR/arch`
 fi
 HOST_OS="$HOST_ARCH"
@@ -437,6 +431,11 @@ if [ -z "$HOST_OS" ]; then
 	esac
 fi
 

 if [ -z "$ARCH" ]; then
 	ARCH=$HOST_ARCH
 fi
@@ -621,7 +620,6 @@
 	if ! am_doing_phase second_stage; then
 		cp "$0"				 "$TARGET/debootstrap/debootstrap"
 		cp $DEBOOTSTRAP_DIR/functions	 "$TARGET/debootstrap/functions"
-		cp $DEBOOTSTRAP_DIR/devices.tar.gz	 "$TARGET/debootstrap/devices.tar.gz"
 		cp $SCRIPT			 "$TARGET/debootstrap/suite-script"
 		echo "$ARCH"			>"$TARGET/debootstrap/arch"
 		echo "$SUITE"			>"$TARGET/debootstrap/suite"

Return to bug 212519

Lines 1-9 Link Here

(-)files/patch-Makefile (-7 / +4 lines)
1	--- Makefile.orig 2015-05-19 09:35:39 UTC	1	--- Makefile.orig 2016-09-09 12:30:20 UTC
2	+++ Makefile	2	+++ Makefile
3	@@ -14,17 +14,15 @@ clean:	3	@@ -6,14 +6,12 @@ all:
4	rm -f devices.tar.gz
5	rm -rf dev
6		4
		5	clean:
		6
7	-DSDIR=$(DESTDIR)/usr/share/debootstrap	7	-DSDIR=$(DESTDIR)/usr/share/debootstrap
8	+DSDIR=$(DESTDIR)%%DATADIR%%	8	+DSDIR=$(DESTDIR)%%DATADIR%%
9	install:	9	install:
Lines 19-24 Link Here
19	- chown root:root $(DESTDIR)/usr/sbin/debootstrap	19	- chown root:root $(DESTDIR)/usr/sbin/debootstrap
20	- chmod 0755 $(DESTDIR)/usr/sbin/debootstrap	20	- chmod 0755 $(DESTDIR)/usr/sbin/debootstrap
21	+ sed 's/@VERSION@/$(VERSION)/g' debootstrap >$(DESTDIR)%%PREFIX%%/sbin/debootstrap	21	+ sed 's/@VERSION@/$(VERSION)/g' debootstrap >$(DESTDIR)%%PREFIX%%/sbin/debootstrap
22
23	ifeq ($(shell uname),Linux)
24	install -o root -g root -m 0644 devices.tar.gz $(DSDIR)/

Lines 1-6 Link Here

(-)files/patch-debootstrap (-12 / +4 lines)
1	--- debootstrap.orig 2014-02-07 15:25:58 UTC	1	--- debootstrap.orig 2016-09-09 12:32:15 UTC
2	+++ debootstrap	2	+++ debootstrap
3	@@ -13,7 +13,7 @@	3	@@ -14,7 +14,7 @@ if [ -z "$DEBOOTSTRAP_DIR" ]; then
4	if [ -x /debootstrap/debootstrap ]; then	4	if [ -x /debootstrap/debootstrap ]; then
5	DEBOOTSTRAP_DIR=/debootstrap	5	DEBOOTSTRAP_DIR=/debootstrap
6	else	6	else
Lines 9-15 Link Here
9	fi	9	fi
10	fi	10	fi
11		11
12	@@ -397,13 +397,7 @@	12	@@ -409,13 +409,7 @@ fi
13		13
14	###########################################################################	14	###########################################################################
15		15
Lines 24-30 Link Here
24	HOST_ARCH=`cat $DEBOOTSTRAP_DIR/arch`	24	HOST_ARCH=`cat $DEBOOTSTRAP_DIR/arch`
25	fi	25	fi
26	HOST_OS="$HOST_ARCH"	26	HOST_OS="$HOST_ARCH"
27	@@ -425,6 +419,11 @@	27	@@ -437,6 +431,11 @@ if [ -z "$HOST_OS" ]; then
28	esac	28	esac
29	fi	29	fi
30		30
Lines 36-46 Link Here
36	if [ -z "$ARCH" ]; then	36	if [ -z "$ARCH" ]; then
37	ARCH=$HOST_ARCH	37	ARCH=$HOST_ARCH
38	fi	38	fi
39	@@ -621,7 +620,6 @@
40	if ! am_doing_phase second_stage; then
41	cp "$0" "$TARGET/debootstrap/debootstrap"
42	cp $DEBOOTSTRAP_DIR/functions "$TARGET/debootstrap/functions"
43	- cp $DEBOOTSTRAP_DIR/devices.tar.gz "$TARGET/debootstrap/devices.tar.gz"
44	cp $SCRIPT "$TARGET/debootstrap/suite-script"
45	echo "$ARCH" >"$TARGET/debootstrap/arch"
46	echo "$SUITE" >"$TARGET/debootstrap/suite"