From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 27552 invoked by alias); 20 Dec 2012 05:03:47 -0000 Received: (qmail 27544 invoked by uid 22791); 20 Dec 2012 05:03:46 -0000 X-SWARE-Spam-Status: No, hits=-2.0 required=5.0 tests=AWL,BAYES_00,RCVD_IN_HOSTKARMA_NO X-Spam-Check-By: sourceware.org Received: from rock.gnat.com (HELO rock.gnat.com) (205.232.38.15) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Thu, 20 Dec 2012 05:03:35 +0000 Received: from localhost (localhost.localdomain [127.0.0.1]) by filtered-rock.gnat.com (Postfix) with ESMTP id D1D2B1C7F14; Thu, 20 Dec 2012 00:03:34 -0500 (EST) Received: from rock.gnat.com ([127.0.0.1]) by localhost (rock.gnat.com [127.0.0.1]) (amavisd-new, port 10024) with LMTP id Muu7PIYg0PT9; Thu, 20 Dec 2012 00:03:34 -0500 (EST) Received: from joel.gnat.com (localhost.localdomain [127.0.0.1]) by rock.gnat.com (Postfix) with ESMTP id 675141C7E89; Thu, 20 Dec 2012 00:03:34 -0500 (EST) Received: by joel.gnat.com (Postfix, from userid 1000) id 19FBCC396A; Thu, 20 Dec 2012 09:03:21 +0400 (RET) Date: Thu, 20 Dec 2012 05:03:00 -0000 From: Joel Brobecker To: Mike Frysinger Cc: gdb-patches@sourceware.org Subject: Re: Update some sim copyright headers to GPLv3-or-later Message-ID: <20121220050320.GE6130@adacore.com> References: <20121219072641.GQ3273@adacore.com> <201212191353.49689.vapier@gentoo.org> <20121220035750.GC6130@adacore.com> <201212192334.22589.vapier@gentoo.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="jq0ap7NbKX2Kqbes" Content-Disposition: inline In-Reply-To: <201212192334.22589.vapier@gentoo.org> User-Agent: Mutt/1.5.21 (2010-09-15) Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2012-12/txt/msg00731.txt.bz2 --jq0ap7NbKX2Kqbes Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-length: 865 > what i mean is worrying about the flow of code. if they aren't both > GPLv2 based, i now have to worry about people being able to make the > claim that i'm committing GPLv3 sim code to the GPLv2 kernel and > tainting it. considering the code in question, doing GPLv3 on it will > gain nothing. I have relayed the above to the FSF. > > I don't understand exactly the status of this file. Can I just > > regenerate the "reverted" version and the project will still work? > > next time someone runs `aclocal` (like me), it'll blow away your > changes as it copies m4 macros from files in /usr/share/ and into the > aclocal.m4. I ran aclocal myself, and it blew away more than just my change, but the entire block of code. Does it mean that only you are able to regenerate this file properly? Attached is what I applied to revert this part of patch. -- Joel --jq0ap7NbKX2Kqbes Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="0001-Revert-GPL-version-change-in-sim-bfin-aclocal.m4.patch" Content-length: 1597 >From f17797f9f4115cef8c2c4142a209a777e9962175 Mon Sep 17 00:00:00 2001 From: Joel Brobecker Date: Thu, 20 Dec 2012 09:00:36 +0400 Subject: [PATCH] Revert GPL version change in sim/bfin/aclocal.m4 sim/bfin/ChangeLog: * aclocal.m4: Revert the previous change changing the license from GPL v2 or later to GPL v3 or later (this file was generated). --- sim/bfin/ChangeLog | 6 ++++++ sim/bfin/aclocal.m4 | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/sim/bfin/ChangeLog b/sim/bfin/ChangeLog index 4c37829..5026a60 100644 --- a/sim/bfin/ChangeLog +++ b/sim/bfin/ChangeLog @@ -1,5 +1,11 @@ 2012-12-20 Joel Brobecker + * aclocal.m4: Revert the previous change changing + the license from GPL v2 or later to GPL v3 or later + (this file was generated). + +2012-12-20 Joel Brobecker + * linux-fixed-code.s: Revert the previous change changing the license from GPL v2 or later to GPL v3 or later. diff --git a/sim/bfin/aclocal.m4 b/sim/bfin/aclocal.m4 index 1e0db3b..1b2d293 100644 --- a/sim/bfin/aclocal.m4 +++ b/sim/bfin/aclocal.m4 @@ -19,7 +19,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3 of the License, or +# the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, but -- 1.7.10.4 --jq0ap7NbKX2Kqbes--