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 ++++++++ vendor/makefile | 42 ++++++++++++++++++++++++++++++++++++++++++ vendor/ubuntu/makefile | 11 +++++++++++ vendor/ubuntu/sources.list.in | 10 ++++++++++ 5 files changed, 82 insertions(+) create mode 100644 vendor/debian/makefile create mode 100644 vendor/debian/sources.list.in create mode 100644 vendor/makefile create mode 100644 vendor/ubuntu/makefile create mode 100644 vendor/ubuntu/sources.list.in (limited to 'vendor') 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 diff --git a/vendor/makefile b/vendor/makefile new file mode 100644 index 000000000..a6d53abd0 --- /dev/null +++ b/vendor/makefile @@ -0,0 +1,42 @@ +# -*- make -*- +BASE=.. +SUBDIR=vendor + +# Bring in the default rules +include ../buildlib/defaults.mak + +all headers library binary program doc manpages debiandoc test update-po startup dirs: current +all: all/subdirs +binary: binary/subdirs +doc: doc/subdirs +clean: clean/subdirs +veryclean: veryclean/subdirs +dirs: dirs/subdirs + +all/subdirs binary/subdirs doc/subdirs dirs/subdirs: + $(MAKE) -C current $(patsubst %/subdirs,%,$@) + +clean/subdirs veryclean/subdirs: + test ! -e current || $(MAKE) -C current $(patsubst %/subdirs,%,$@) + +current: + rm -f $@ + # search for an exact match to use the correct sources.list example + find -mindepth 1 -maxdepth 1 -type d | cut -d'/' -f 2 | while read DISTRO; do \ + if dpkg-vendor --is $$DISTRO; then \ + ln -s $$DISTRO $@; \ + break; \ + fi; \ + done + # if we haven't found a specific, look for a deriving in hardcoded order + test -e $@ || \ + (dpkg-vendor --derives-from ubuntu && cp ln -s ubuntu $@ ) || \ + ln -s debian $@ + +.PHONY: clean veryclean all binary vendor + +clean: clean/current + +clean/current: + test ! -e current || $(MAKE) -C current clean + rm -f current 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 '^ $@ diff --git a/vendor/ubuntu/sources.list.in b/vendor/ubuntu/sources.list.in new file mode 100644 index 000000000..b9aa8c3d0 --- /dev/null +++ b/vendor/ubuntu/sources.list.in @@ -0,0 +1,10 @@ + # See sources.list(5) manpage for more information + # Remember that CD-ROMs, DVDs and such are managed through the apt-cdrom tool. +deb http://us.archive.ubuntu.com/ubuntu &ubuntu-codename; main restricted +deb-src http://us.archive.ubuntu.com/ubuntu &ubuntu-codename; main restricted + +deb http://security.ubuntu.com/ubuntu &ubuntu-codename;-security main restricted +deb-src http://security.ubuntu.com/ubuntu &ubuntu-codename;-security main restricted + +deb http://us.archive.ubuntu.com/ubuntu &ubuntu-codename;-updates main restricted +deb-src http://us.archive.ubuntu.com/ubuntu &ubuntu-codename;-updates main restricted -- 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 +++++ vendor/ubuntu/apt-vendor.ent | 5 +++++ 2 files changed, 10 insertions(+) create mode 100644 vendor/debian/apt-vendor.ent create mode 100644 vendor/ubuntu/apt-vendor.ent (limited to 'vendor') 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"> diff --git a/vendor/ubuntu/apt-vendor.ent b/vendor/ubuntu/apt-vendor.ent new file mode 100644 index 000000000..fd5e5a7cf --- /dev/null +++ b/vendor/ubuntu/apt-vendor.ent @@ -0,0 +1,5 @@ + + +ubuntu-keyring"> +/usr/share/keyrings/ubuntu-archive-keyring.gpg"> +/usr/share/keyrings/ubuntu-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 +- vendor/getinfo | 36 ++++++++++++++++++++++++++++++++++++ vendor/ubuntu/makefile | 2 +- 3 files changed, 38 insertions(+), 2 deletions(-) create mode 100755 vendor/getinfo (limited to 'vendor') 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' $< > $@ diff --git a/vendor/getinfo b/vendor/getinfo new file mode 100755 index 000000000..df5a44e5c --- /dev/null +++ b/vendor/getinfo @@ -0,0 +1,36 @@ +#!/bin/sh +# small helper to extract information form *.ent files + +BASEDIR="$(readlink -f "$(dirname $0)")" +INFO="$(readlink -f "${BASEDIR}/current/apt-vendor.ent")" + +if [ -z "$INFO" ] || [ ! -e "$INFO" ]; then + echo >&2 'The current vendor is not valid or not chosen by the buildsystem yet.' + exit 1 +fi + +getrawfield() { + grep --max-count=1 "^}" + echo "${FIELD%<*}" +} + +case "$1" in +debian-stable-codename) + getrawfield 'stable-codename' "${BASEDIR}/../doc/apt-verbatim.ent" + ;; +ubuntu-codename) + getrawfield 'stable-codename' "${BASEDIR}/../doc/apt-verbatim.ent" + ;; +keyring-package) + getfield "$1" + ;; +*) + echo >&2 "Unknown data field $1 requested" + exit 2 + ;; +esac 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 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 ++ vendor/getinfo | 2 +- vendor/ubuntu/apt-vendor.ent | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) (limited to 'vendor') 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"> + + diff --git a/vendor/getinfo b/vendor/getinfo index df5a44e5c..ac816e10e 100755 --- a/vendor/getinfo +++ b/vendor/getinfo @@ -26,7 +26,7 @@ debian-stable-codename) ubuntu-codename) getrawfield 'stable-codename' "${BASEDIR}/../doc/apt-verbatim.ent" ;; -keyring-package) +keyring-package|keyring-filename|keyring-master-filename|keyring-removed-filename|keyring-uri) getfield "$1" ;; *) diff --git a/vendor/ubuntu/apt-vendor.ent b/vendor/ubuntu/apt-vendor.ent index fd5e5a7cf..caa532699 100644 --- a/vendor/ubuntu/apt-vendor.ent +++ b/vendor/ubuntu/apt-vendor.ent @@ -3,3 +3,5 @@ ubuntu-keyring"> /usr/share/keyrings/ubuntu-archive-keyring.gpg"> /usr/share/keyrings/ubuntu-archive-removed-keys.gpg"> + + -- 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') 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 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') 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 +- vendor/makefile | 3 ++- vendor/ubuntu/makefile | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) (limited to 'vendor') 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' $< > $@ diff --git a/vendor/makefile b/vendor/makefile index a6d53abd0..c05b516ef 100644 --- a/vendor/makefile +++ b/vendor/makefile @@ -12,8 +12,9 @@ doc: doc/subdirs clean: clean/subdirs veryclean: veryclean/subdirs dirs: dirs/subdirs +manpages: manpages/subdirs -all/subdirs binary/subdirs doc/subdirs dirs/subdirs: +all/subdirs binary/subdirs doc/subdirs dirs/subdirs manpages/subdirs: $(MAKE) -C current $(patsubst %/subdirs,%,$@) clean/subdirs veryclean/subdirs: 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 cc4caeae4d522e9f270ceba6a4a99e7ce1b6da26 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Sat, 21 Dec 2013 16:21:29 +0100 Subject: add apt-vendor for raspbian. Closes: #732749 --- vendor/raspbian/apt-vendor.ent | 7 +++++++ vendor/raspbian/makefile | 11 +++++++++++ vendor/raspbian/sources.list.in | 6 ++++++ 3 files changed, 24 insertions(+) create mode 100644 vendor/raspbian/apt-vendor.ent create mode 100644 vendor/raspbian/makefile create mode 100644 vendor/raspbian/sources.list.in (limited to 'vendor') diff --git a/vendor/raspbian/apt-vendor.ent b/vendor/raspbian/apt-vendor.ent new file mode 100644 index 000000000..e359d2001 --- /dev/null +++ b/vendor/raspbian/apt-vendor.ent @@ -0,0 +1,7 @@ + + +raspbian-archive-keyring"> +/usr/share/keyrings/raspbian-archive-keyring.gpg"> +/usr/share/keyrings/raspbian-archive-removed-keys.gpg"> + + diff --git a/vendor/raspbian/makefile b/vendor/raspbian/makefile new file mode 100644 index 000000000..ced566c30 --- /dev/null +++ b/vendor/raspbian/makefile @@ -0,0 +1,11 @@ +# -*- make -*- +BASE=../.. +SUBDIR=vendor/raspbian + +# Bring in the default rules +include ../../buildlib/defaults.mak + +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' $< > $@ diff --git a/vendor/raspbian/sources.list.in b/vendor/raspbian/sources.list.in new file mode 100644 index 000000000..29ddcc4d6 --- /dev/null +++ b/vendor/raspbian/sources.list.in @@ -0,0 +1,6 @@ +# See sources.list(5) manpage for more information +# Remember that CD-ROMs, DVDs and such are managed through the apt-cdrom tool. +deb http://mirrordirector.raspbian.org/raspbian &stable-codename; main contrib non-free + +# Uncomment if you want the apt-get source function to work +#deb-src http://mirrordirector.raspbian.org/raspbian &stable-codename; main contrib non-free -- cgit v1.2.3 From 6de58cbf6b78506898ef23ca26b068eedf8ed97f Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Sat, 21 Dec 2013 17:56:32 +0100 Subject: vendor/getinfo: * vendor/getinfo: - fix ubuntu-codename --- vendor/getinfo | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'vendor') diff --git a/vendor/getinfo b/vendor/getinfo index ac816e10e..992b30cf4 100755 --- a/vendor/getinfo +++ b/vendor/getinfo @@ -24,7 +24,7 @@ debian-stable-codename) getrawfield 'stable-codename' "${BASEDIR}/../doc/apt-verbatim.ent" ;; ubuntu-codename) - getrawfield 'stable-codename' "${BASEDIR}/../doc/apt-verbatim.ent" + getrawfield 'ubuntu-codename' "${BASEDIR}/../doc/apt-verbatim.ent" ;; keyring-package|keyring-filename|keyring-master-filename|keyring-removed-filename|keyring-uri) getfield "$1" -- cgit v1.2.3 From 62f6ecbf2f204d95e98fc5480c5a0db43b52d2be Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Sat, 21 Dec 2013 18:18:51 +0100 Subject: vendor/steamos/*: * vendor/steamos/*: - add steamos support --- vendor/getinfo | 2 +- vendor/steamos/apt-vendor.ent | 8 ++++++++ vendor/steamos/makefile | 11 +++++++++++ vendor/steamos/sources.list.in | 7 +++++++ 4 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 vendor/steamos/apt-vendor.ent create mode 100644 vendor/steamos/makefile create mode 100644 vendor/steamos/sources.list.in (limited to 'vendor') diff --git a/vendor/getinfo b/vendor/getinfo index 992b30cf4..861fd3d17 100755 --- a/vendor/getinfo +++ b/vendor/getinfo @@ -26,7 +26,7 @@ debian-stable-codename) ubuntu-codename) getrawfield 'ubuntu-codename' "${BASEDIR}/../doc/apt-verbatim.ent" ;; -keyring-package|keyring-filename|keyring-master-filename|keyring-removed-filename|keyring-uri) +keyring-package|keyring-filename|keyring-master-filename|keyring-removed-filename|keyring-uri|current-distro-codename) getfield "$1" ;; *) diff --git a/vendor/steamos/apt-vendor.ent b/vendor/steamos/apt-vendor.ent new file mode 100644 index 000000000..69bb254ef --- /dev/null +++ b/vendor/steamos/apt-vendor.ent @@ -0,0 +1,8 @@ + + +valve-archive-keyring"> +/usr/share/keyrings/valve-archive-keyring.gpg"> +/usr/share/keyrings/valve-archive-removed-keys.gpg"> + + + diff --git a/vendor/steamos/makefile b/vendor/steamos/makefile new file mode 100644 index 000000000..c27494587 --- /dev/null +++ b/vendor/steamos/makefile @@ -0,0 +1,11 @@ +# -*- make -*- +BASE=../.. +SUBDIR=vendor/steamos + +# Bring in the default rules +include ../../buildlib/defaults.mak + +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' $< | sed -e 's#&steamos-codename;#$(shell ../getinfo current-distro-codename)#g' > $@ diff --git a/vendor/steamos/sources.list.in b/vendor/steamos/sources.list.in new file mode 100644 index 000000000..f3790c550 --- /dev/null +++ b/vendor/steamos/sources.list.in @@ -0,0 +1,7 @@ +# See sources.list(5) manpage for more information +# Remember that CD-ROMs, DVDs and such are managed through the apt-cdrom tool. + +deb http://repo.steampowered.com/steamos &steamos-codename; main contrib non-free +deb-src http://repo.steampowered.com/steamos &steamos-codename; main contrib non-free + +deb http://cdn.debian.net/debian &stable-codename; main -- cgit v1.2.3 From a127de147900050d3dbc3644ed468428749c46fd Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 27 Dec 2013 09:34:34 +0100 Subject: remove debian entry from default steamos sources.list --- vendor/steamos/sources.list.in | 2 -- 1 file changed, 2 deletions(-) (limited to 'vendor') diff --git a/vendor/steamos/sources.list.in b/vendor/steamos/sources.list.in index f3790c550..fed6c3818 100644 --- a/vendor/steamos/sources.list.in +++ b/vendor/steamos/sources.list.in @@ -3,5 +3,3 @@ deb http://repo.steampowered.com/steamos &steamos-codename; main contrib non-free deb-src http://repo.steampowered.com/steamos &steamos-codename; main contrib non-free - -deb http://cdn.debian.net/debian &stable-codename; main -- cgit v1.2.3 From 0e2d81b5b4e6ec4117f38fc546ed3324ba4fa5cc Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Sun, 29 Dec 2013 16:40:49 +0100 Subject: vendor/ubuntu/sources.list.in: whitespace fix --- vendor/ubuntu/sources.list.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'vendor') diff --git a/vendor/ubuntu/sources.list.in b/vendor/ubuntu/sources.list.in index b9aa8c3d0..00db2f8cd 100644 --- a/vendor/ubuntu/sources.list.in +++ b/vendor/ubuntu/sources.list.in @@ -1,5 +1,5 @@ - # See sources.list(5) manpage for more information - # Remember that CD-ROMs, DVDs and such are managed through the apt-cdrom tool. +# See sources.list(5) manpage for more information +# Remember that CD-ROMs, DVDs and such are managed through the apt-cdrom tool. deb http://us.archive.ubuntu.com/ubuntu &ubuntu-codename; main restricted deb-src http://us.archive.ubuntu.com/ubuntu &ubuntu-codename; main restricted -- 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/debian/makefile | 4 ++++ vendor/raspbian/makefile | 3 +++ vendor/steamos/makefile | 4 ++++ vendor/ubuntu/makefile | 3 +++ 4 files changed, 14 insertions(+) (limited to 'vendor') diff --git a/vendor/debian/makefile b/vendor/debian/makefile index 1f82d7f47..a1bb74f9b 100644 --- a/vendor/debian/makefile +++ b/vendor/debian/makefile @@ -9,3 +9,7 @@ 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' $< > $@ + +clean: + rm -f sources.list + diff --git a/vendor/raspbian/makefile b/vendor/raspbian/makefile index ced566c30..e5513ead4 100644 --- a/vendor/raspbian/makefile +++ b/vendor/raspbian/makefile @@ -9,3 +9,6 @@ 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' $< > $@ + +clean: + rm -f sources.list diff --git a/vendor/steamos/makefile b/vendor/steamos/makefile index c27494587..45ea18be2 100644 --- a/vendor/steamos/makefile +++ b/vendor/steamos/makefile @@ -9,3 +9,7 @@ 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' $< | sed -e 's#&steamos-codename;#$(shell ../getinfo current-distro-codename)#g' > $@ + +clean: + rm -f sources.list + 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/debian/makefile | 4 +++- vendor/raspbian/makefile | 4 +++- vendor/steamos/makefile | 4 +++- vendor/ubuntu/makefile | 4 +++- 4 files changed, 12 insertions(+), 4 deletions(-) (limited to 'vendor') diff --git a/vendor/debian/makefile b/vendor/debian/makefile index a1bb74f9b..25bc0350c 100644 --- a/vendor/debian/makefile +++ b/vendor/debian/makefile @@ -10,6 +10,8 @@ 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' $< > $@ -clean: +clean: clean/sources.list + +clean/sources.list: rm -f sources.list diff --git a/vendor/raspbian/makefile b/vendor/raspbian/makefile index e5513ead4..c4464900f 100644 --- a/vendor/raspbian/makefile +++ b/vendor/raspbian/makefile @@ -10,5 +10,7 @@ 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' $< > $@ -clean: +clean: clean/sources.list + +clean/sources.list: rm -f sources.list diff --git a/vendor/steamos/makefile b/vendor/steamos/makefile index 45ea18be2..9ee0e65a2 100644 --- a/vendor/steamos/makefile +++ b/vendor/steamos/makefile @@ -10,6 +10,8 @@ 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' $< | sed -e 's#&steamos-codename;#$(shell ../getinfo current-distro-codename)#g' > $@ -clean: +clean: clean/sources.list + +clean/sources.list: rm -f sources.list 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 From bef4b142853642db669f6ffea54fa52c9b52cd95 Mon Sep 17 00:00:00 2001 From: Jon Severinsson Date: Sat, 22 Feb 2014 18:40:09 +0100 Subject: add apt-vendor information for tanglu --- vendor/getinfo | 3 +++ vendor/makefile | 2 ++ vendor/tanglu/apt-vendor.ent | 7 +++++++ vendor/tanglu/makefile | 11 +++++++++++ vendor/tanglu/sources.list.in | 7 +++++++ 5 files changed, 30 insertions(+) create mode 100644 vendor/tanglu/apt-vendor.ent create mode 100644 vendor/tanglu/makefile create mode 100644 vendor/tanglu/sources.list.in (limited to 'vendor') diff --git a/vendor/getinfo b/vendor/getinfo index 861fd3d17..4422f5d78 100755 --- a/vendor/getinfo +++ b/vendor/getinfo @@ -23,6 +23,9 @@ case "$1" in debian-stable-codename) getrawfield 'stable-codename' "${BASEDIR}/../doc/apt-verbatim.ent" ;; +tanglu-codename) + getrawfield 'tanglu-codename' "${BASEDIR}/../doc/apt-verbatim.ent" + ;; ubuntu-codename) getrawfield 'ubuntu-codename' "${BASEDIR}/../doc/apt-verbatim.ent" ;; diff --git a/vendor/makefile b/vendor/makefile index c05b516ef..619c603fb 100644 --- a/vendor/makefile +++ b/vendor/makefile @@ -32,9 +32,11 @@ current: # if we haven't found a specific, look for a deriving in hardcoded order test -e $@ || \ (dpkg-vendor --derives-from ubuntu && cp ln -s ubuntu $@ ) || \ + (dpkg-vendor --derives-from tanglu && cp ln -s tanglu $@ ) || \ ln -s debian $@ .PHONY: clean veryclean all binary vendor +.NOPARALLEL: clean: clean/current diff --git a/vendor/tanglu/apt-vendor.ent b/vendor/tanglu/apt-vendor.ent new file mode 100644 index 000000000..4b70a5f82 --- /dev/null +++ b/vendor/tanglu/apt-vendor.ent @@ -0,0 +1,7 @@ + + +tanglu-archive-keyring"> +/usr/share/keyrings/tanglu-archive-keyring.gpg"> +/usr/share/keyrings/tanglu-archive-removed-keys.gpg"> + + diff --git a/vendor/tanglu/makefile b/vendor/tanglu/makefile new file mode 100644 index 000000000..175db1a8c --- /dev/null +++ b/vendor/tanglu/makefile @@ -0,0 +1,11 @@ +# -*- make -*- +BASE=../.. +SUBDIR=vendor/tanglu + +# Bring in the default rules +include ../../buildlib/defaults.mak + +doc binary manpages: sources.list + +sources.list: sources.list.in ../../doc/apt-verbatim.ent + sed -e 's#&tanglu-codename;#$(shell ../getinfo tanglu-codename)#g' $< > $@ diff --git a/vendor/tanglu/sources.list.in b/vendor/tanglu/sources.list.in new file mode 100644 index 000000000..dfa219046 --- /dev/null +++ b/vendor/tanglu/sources.list.in @@ -0,0 +1,7 @@ +# See sources.list(5) manpage for more information + +deb http://archive.tanglu.org/tanglu &tanglu-codename; main contrib non-free +#deb-src http://archive.tanglu.org/tanglu &tanglu-codename; main contrib non-free + +#deb http://archive.tanglu.org/tanglu &tanglu-codename;-updates main contrib non-free +#deb-src http://archive.tanglu.org/tanglu &tanglu-codename;-updates main contrib non-free -- cgit v1.2.3 From b7ed961b8099c05f65e18d4c73ead50cc5c8bff1 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Sun, 23 Feb 2014 00:41:52 +0100 Subject: vendor/tanglu/makefile: add missing clean/sources.list --- vendor/tanglu/makefile | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'vendor') diff --git a/vendor/tanglu/makefile b/vendor/tanglu/makefile index 175db1a8c..9fe680bc6 100644 --- a/vendor/tanglu/makefile +++ b/vendor/tanglu/makefile @@ -9,3 +9,8 @@ doc binary manpages: sources.list sources.list: sources.list.in ../../doc/apt-verbatim.ent sed -e 's#&tanglu-codename;#$(shell ../getinfo tanglu-codename)#g' $< > $@ + +clean: clean/sources.list + +clean/sources.list: + rm -f sources.list -- cgit v1.2.3