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/debian/makefile | 11 +++++++++++ vendor/debian/sources.list.in | 8 ++++++++ 2 files changed, 19 insertions(+) create mode 100644 vendor/debian/makefile create mode 100644 vendor/debian/sources.list.in (limited to 'vendor/debian') diff --git a/vendor/debian/makefile b/vendor/debian/makefile new file mode 100644 index 000000000..41202c6a0 --- /dev/null +++ b/vendor/debian/makefile @@ -0,0 +1,11 @@ +# -*- make -*- +BASE=../.. +SUBDIR=vendor/debian + +# Bring in the default rules +include ../../buildlib/defaults.mak + +doc: sources.list + +sources.list: sources.list.in ../../doc/apt-verbatim.ent + sed -e 's#&stable-codename;#$(shell grep --max-count=1 '^ $@ diff --git a/vendor/debian/sources.list.in b/vendor/debian/sources.list.in new file mode 100644 index 000000000..745e32cbe --- /dev/null +++ b/vendor/debian/sources.list.in @@ -0,0 +1,8 @@ +# See sources.list(5) manpage for more information +# Remember that CD-ROMs, DVDs and such are managed through the apt-cdrom tool. +deb http://ftp.us.debian.org/debian &stable-codename; main contrib non-free +deb http://security.debian.org &stable-codename;/updates main contrib non-free + +# Uncomment if you want the apt-get source function to work +#deb-src http://ftp.us.debian.org/debian &stable-codename; main contrib non-free +#deb-src http://security.debian.org &stable-codename;/updates main contrib non-free -- cgit v1.2.3 From 694ef56e802bbab94595fc491fdc6ef8b4f525c1 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 30 Nov 2013 19:15:02 +0100 Subject: add a vendor specific file to have configurable entities manpages sometimes refer to distro-specific things like the name of the package providing the achive-keyring. Having a central place to configure this helps in having it consistent in the manpages and allows to load this info from other places in the buildsystem as well later. --- vendor/debian/apt-vendor.ent | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 vendor/debian/apt-vendor.ent (limited to 'vendor/debian') diff --git a/vendor/debian/apt-vendor.ent b/vendor/debian/apt-vendor.ent new file mode 100644 index 000000000..56775bbaa --- /dev/null +++ b/vendor/debian/apt-vendor.ent @@ -0,0 +1,5 @@ + + +debian-archive-keyring"> +/usr/share/keyrings/debian-archive-keyring.gpg"> +/usr/share/keyrings/debian-archive-removed-keys.gpg"> -- 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/debian/makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'vendor/debian') diff --git a/vendor/debian/makefile b/vendor/debian/makefile index 41202c6a0..dd35a70f0 100644 --- a/vendor/debian/makefile +++ b/vendor/debian/makefile @@ -8,4 +8,4 @@ include ../../buildlib/defaults.mak doc: sources.list sources.list: sources.list.in ../../doc/apt-verbatim.ent - sed -e 's#&stable-codename;#$(shell grep --max-count=1 '^ $@ + sed -e 's#&stable-codename;#$(shell ../getinfo debian-stable-codename)#g' $< > $@ -- cgit v1.2.3 From 5b2c6ddcc0e45c92c544032ad2bb91bdf7222d7c Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 30 Nov 2013 23:11:43 +0100 Subject: generate apt-key script with vendor info about keys MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The apt-key script uses quiet a few keyring files for operation which are specific to the distribution it is build on and is hence one of the most patched parts – even if it is not that often used anymore now that a fragment directory for trusted.gpg exists. --- vendor/debian/apt-vendor.ent | 2 ++ 1 file changed, 2 insertions(+) (limited to 'vendor/debian') diff --git a/vendor/debian/apt-vendor.ent b/vendor/debian/apt-vendor.ent index 56775bbaa..6cda5995c 100644 --- a/vendor/debian/apt-vendor.ent +++ b/vendor/debian/apt-vendor.ent @@ -3,3 +3,5 @@ debian-archive-keyring"> /usr/share/keyrings/debian-archive-keyring.gpg"> /usr/share/keyrings/debian-archive-removed-keys.gpg"> + + -- cgit v1.2.3 From 7d15eeef6e61d9a02efcad2dc704f22df4276d9b Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 6 Dec 2013 13:22:00 +0100 Subject: vendor/debian/makefile: apply 6f3c4e33 for debian/makefile as well --- vendor/debian/makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'vendor/debian') diff --git a/vendor/debian/makefile b/vendor/debian/makefile index dd35a70f0..42c86e1c4 100644 --- a/vendor/debian/makefile +++ b/vendor/debian/makefile @@ -5,7 +5,7 @@ SUBDIR=vendor/debian # 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#&stable-codename;#$(shell ../getinfo debian-stable-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/debian/makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'vendor/debian') diff --git a/vendor/debian/makefile b/vendor/debian/makefile index 42c86e1c4..1f82d7f47 100644 --- a/vendor/debian/makefile +++ b/vendor/debian/makefile @@ -5,7 +5,7 @@ SUBDIR=vendor/debian # 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#&stable-codename;#$(shell ../getinfo debian-stable-codename)#g' $< > $@ -- cgit v1.2.3