From eef71f11a5836eb82df133cb4e24cb4806642188 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 30 Nov 2013 14:01:28 +0100 Subject: introduce a vendor system to change sources.list Many derivatives make quiet a few simple changes to apt introducing silly diffs just to change examples and co making it harder for them to update apt and harder for us to merge real changes back. First stop: doc/examples/sources.list --- vendor/ubuntu/makefile | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 vendor/ubuntu/makefile (limited to 'vendor/ubuntu/makefile') diff --git a/vendor/ubuntu/makefile b/vendor/ubuntu/makefile new file mode 100644 index 000000000..388a529a9 --- /dev/null +++ b/vendor/ubuntu/makefile @@ -0,0 +1,11 @@ +# -*- make -*- +BASE=../.. +SUBDIR=vendor/ubuntu + +# Bring in the default rules +include ../../buildlib/defaults.mak + +doc: sources.list + +sources.list: sources.list.in ../../doc/apt-verbatim.ent + sed -e 's#&ubuntu-codename;#$(shell grep --max-count=1 '^ $@ -- cgit v1.2.3 From 0005fa07886135d6adfec59f2d722df229b7af12 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 30 Nov 2013 22:07:38 +0100 Subject: use a substvar to set the archive-keyring in debian/control Adds a small helper to extract the small information bits we store in apt-vendor.ent and uses it in debian/rules to set apt:keyring as a substvar for debian/control populated with the &keyring-package; info --- vendor/ubuntu/makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'vendor/ubuntu/makefile') diff --git a/vendor/ubuntu/makefile b/vendor/ubuntu/makefile index 388a529a9..ea67e6e63 100644 --- a/vendor/ubuntu/makefile +++ b/vendor/ubuntu/makefile @@ -8,4 +8,4 @@ include ../../buildlib/defaults.mak doc: sources.list sources.list: sources.list.in ../../doc/apt-verbatim.ent - sed -e 's#&ubuntu-codename;#$(shell grep --max-count=1 '^ $@ + sed -e 's#&ubuntu-codename;#$(shell ../getinfo ubuntu-codename)#g' $< > $@ -- cgit v1.2.3 From 6f3c4e3300d8a213ce438d03c8de4196c4be960a Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 6 Dec 2013 08:00:43 +0100 Subject: vendor/makefile: fix build error for parallel builds --- vendor/ubuntu/makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'vendor/ubuntu/makefile') diff --git a/vendor/ubuntu/makefile b/vendor/ubuntu/makefile index ea67e6e63..88061bde2 100644 --- a/vendor/ubuntu/makefile +++ b/vendor/ubuntu/makefile @@ -5,7 +5,7 @@ SUBDIR=vendor/ubuntu # Bring in the default rules include ../../buildlib/defaults.mak -doc: sources.list +doc binary: sources.list sources.list: sources.list.in ../../doc/apt-verbatim.ent sed -e 's#&ubuntu-codename;#$(shell ../getinfo ubuntu-codename)#g' $< > $@ -- cgit v1.2.3 From 5cc8cbf368251c4be4ffa1482fa5fb6b9d950452 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 6 Dec 2013 17:29:50 +0100 Subject: fix build failure with the new apt-vendors stuff --- vendor/ubuntu/makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'vendor/ubuntu/makefile') diff --git a/vendor/ubuntu/makefile b/vendor/ubuntu/makefile index 88061bde2..c4b35935f 100644 --- a/vendor/ubuntu/makefile +++ b/vendor/ubuntu/makefile @@ -5,7 +5,7 @@ SUBDIR=vendor/ubuntu # Bring in the default rules include ../../buildlib/defaults.mak -doc binary: sources.list +doc binary manpages: sources.list sources.list: sources.list.in ../../doc/apt-verbatim.ent sed -e 's#&ubuntu-codename;#$(shell ../getinfo ubuntu-codename)#g' $< > $@ -- cgit v1.2.3 From 46a78c652d80818b4643c471432ae961b1ca5bd9 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Sat, 22 Feb 2014 18:07:43 +0100 Subject: remove auto-generated apt-key and sources.list on clean (closes: 739749) --- vendor/ubuntu/makefile | 3 +++ 1 file changed, 3 insertions(+) (limited to 'vendor/ubuntu/makefile') diff --git a/vendor/ubuntu/makefile b/vendor/ubuntu/makefile index c4b35935f..1fe138d2b 100644 --- a/vendor/ubuntu/makefile +++ b/vendor/ubuntu/makefile @@ -9,3 +9,6 @@ doc binary manpages: sources.list sources.list: sources.list.in ../../doc/apt-verbatim.ent sed -e 's#&ubuntu-codename;#$(shell ../getinfo ubuntu-codename)#g' $< > $@ + +clean: + rm -f sources.list -- cgit v1.2.3 From 5077916ef802948e6a3faab95b2d2a975438ec26 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Sat, 22 Feb 2014 18:22:04 +0100 Subject: improve clean for auto-generated sources.list --- vendor/ubuntu/makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'vendor/ubuntu/makefile') diff --git a/vendor/ubuntu/makefile b/vendor/ubuntu/makefile index 1fe138d2b..afcaaf718 100644 --- a/vendor/ubuntu/makefile +++ b/vendor/ubuntu/makefile @@ -10,5 +10,7 @@ doc binary manpages: sources.list sources.list: sources.list.in ../../doc/apt-verbatim.ent sed -e 's#&ubuntu-codename;#$(shell ../getinfo ubuntu-codename)#g' $< > $@ -clean: +clean: clean/sources.list + +clean/sources.list: rm -f sources.list -- cgit v1.2.3