Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 564928 Details for
Bug 677800
Migrate the ACCEPT_LICENSE default from portage to the base profile
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Proposed patch for Portage
0001-Don-t-define-a-default-for-ACCEPT_LICENSE.patch (text/plain), 4.23 KB, created by
Ulrich Müller
on 2019-02-12 14:26:02 UTC
(
hide
)
Description:
Proposed patch for Portage
Filename:
MIME Type:
Creator:
Ulrich Müller
Created:
2019-02-12 14:26:02 UTC
Size:
4.23 KB
patch
obsolete
>From aab1836e817dc8303ae139f07ae8a64c1bfea747 Mon Sep 17 00:00:00 2001 >From: =?UTF-8?q?Ulrich=20M=C3=BCller?= <ulm@gentoo.org> >Date: Tue, 12 Feb 2019 15:15:32 +0100 >Subject: [PATCH] Don't define a default for ACCEPT_LICENSE >MIME-Version: 1.0 >Content-Type: text/plain; charset=UTF-8 >Content-Transfer-Encoding: 8bit > >In its 2019-02-10 meeting, the Gentoo Council has decided that the >default for ACCEPT_LICENSE should be changed to @FREE. We take that >opportunity to move the default to make.defaults in the base profile, >for the following reasons: > - The setting depends on the @FREE license group, which itself is not > defined in Portage, but in profiles/license_groups. > - Setting the default in profiles will allow to perform the switchover > at a precise time, independent of Portage release and stabilisation > schedule. > - Profiles are a better location to define the default distro policy. > - GLEP 23 says so. > >Signed-off-by: Ulrich Müller <ulm@gentoo.org> >--- > cnf/make.conf.example | 8 ++++---- > cnf/make.globals | 3 +-- > lib/portage/package/ebuild/_config/special_env_vars.py | 3 +-- > man/make.conf.5 | 6 +++--- > 4 files changed, 9 insertions(+), 11 deletions(-) > >diff --git a/cnf/make.conf.example b/cnf/make.conf.example >index ffebd24d4..70cb8b19b 100644 >--- a/cnf/make.conf.example >+++ b/cnf/make.conf.example >@@ -1,4 +1,4 @@ >-# Copyright 1999-2013 Gentoo Foundation >+# Copyright 1999-2019 Gentoo Authors > # Distributed under the terms of the GNU General Public License v2 > # Contains local system settings for Portage system > >@@ -84,11 +84,11 @@ > # license_groups file (see portage(5) man page). In addition to license > # and group names, the * and -* wildcard tokens are also supported. > # >-# Accept any license except those in the EULA license group (default). >-#ACCEPT_LICENSE="* -@EULA" >-# > # Only accept licenses in the FREE license group (i.e. Free Software). > #ACCEPT_LICENSE="-* @FREE" >+# >+# Accept any license except those in the EULA license group. >+#ACCEPT_LICENSE="* -@EULA" > > # Portage Directories > # =================== >diff --git a/cnf/make.globals b/cnf/make.globals >index 5a3015ae2..b4ed8c466 100644 >--- a/cnf/make.globals >+++ b/cnf/make.globals >@@ -1,4 +1,4 @@ >-# Copyright 1999-2018 Gentoo Authors >+# Copyright 1999-2019 Gentoo Authors > # Distributed under the terms of the GNU General Public License v2 > # System-wide defaults for the Portage system > >@@ -23,7 +23,6 @@ FCFLAGS="" > # Approved by the mirror-admin team. > GENTOO_MIRRORS="http://distfiles.gentoo.org" > >-ACCEPT_LICENSE="* -@EULA" > ACCEPT_PROPERTIES="*" > ACCEPT_RESTRICT="*" > >diff --git a/lib/portage/package/ebuild/_config/special_env_vars.py b/lib/portage/package/ebuild/_config/special_env_vars.py >index f4f2bec2c..f9a0c3c0e 100644 >--- a/lib/portage/package/ebuild/_config/special_env_vars.py >+++ b/lib/portage/package/ebuild/_config/special_env_vars.py >@@ -1,4 +1,4 @@ >-# Copyright 2010-2018 Gentoo Foundation >+# Copyright 2010-2019 Gentoo Authors > # Distributed under the terms of the GNU General Public License v2 > > from __future__ import unicode_literals >@@ -199,7 +199,6 @@ global_only_vars = frozenset([ > ]) > > default_globals = { >- 'ACCEPT_LICENSE': '* -@EULA', > 'ACCEPT_PROPERTIES': '*', > 'PORTAGE_BZIP2_COMMAND': 'bzip2', > } >diff --git a/man/make.conf.5 b/man/make.conf.5 >index a8f5b639f..adbd6dc85 100644 >--- a/man/make.conf.5 >+++ b/man/make.conf.5 >@@ -1,4 +1,4 @@ >-.TH "MAKE.CONF" "5" "Nov 2018" "Portage VERSION" "Portage" >+.TH "MAKE.CONF" "5" "Feb 2019" "Portage VERSION" "Portage" > .SH "NAME" > make.conf \- custom settings for Portage > .SH "SYNOPSIS" >@@ -64,7 +64,7 @@ file (see \fBportage\fR(5)). In addition to license and group names, the > for further information: > \fIhttps://www.gentoo.org/glep/glep-0023.html\fR. > .br >-Defaults to the value of * -@EULA. >+Defaults to the value defined in the profile. > .br > .I Examples: > .nf >@@ -72,7 +72,7 @@ Defaults to the value of * -@EULA. > ACCEPT_LICENSE="-* @FREE" > # As before, but exclude the "Artistic" license > ACCEPT_LICENSE="-* @FREE -Artistic" >-# Accept any license except those in the EULA license group (default) >+# Accept any license except those in the EULA license group > ACCEPT_LICENSE="* -@EULA" > .fi > .TP >-- >2.19.2 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 677800
:
564928
|
565022
|
565026
|
565028