Message ID | 20200723202056.1334339-1-mail@aparcar.org |
---|---|
State | Changes Requested |
Delegated to: | Adrian Schmutzler |
Headers | show |
Series | toolchain: treewide add PKG_RELEASE if local files | expand |
Hi Paul, > -----Original Message----- > From: openwrt-devel [mailto:openwrt-devel-bounces@lists.openwrt.org] > On Behalf Of Paul Spooren > Sent: Donnerstag, 23. Juli 2020 22:21 > To: openwrt-devel@lists.openwrt.org > Cc: Paul Spooren <mail@aparcar.org> > Subject: [PATCH] toolchain: treewide add PKG_RELEASE if local files > > The toolchain packages partly contain local code like patches and > configuration files. These files are not tracked via PKG_VERSION as this > variable only covers the upstream package version. > > To allow versioning of the buildsystem, this commit adds PKG_RELEASE:=1 to > all toolchain packages with local files. Whenever a local file is changed the > release must be increased. This makes sense for the latter three, but I'm not sure whether it is a good idea for binutils and gcc, as those are effectively "multi-version" packages. I will cut out the latter three and apply it for them for now. Best Adrian > > Also update the copyright of touched files to 2020. > > Signed-off-by: Paul Spooren <mail@aparcar.org> > --- > toolchain/binutils/Makefile | 3 ++- > toolchain/gcc/common.mk | 3 ++- > toolchain/gdb/Makefile | 3 ++- > toolchain/glibc/common.mk | 3 ++- > toolchain/uClibc/common.mk | 3 ++- > 5 files changed, 10 insertions(+), 5 deletions(-) > > diff --git a/toolchain/binutils/Makefile b/toolchain/binutils/Makefile index > c5c8bf588c..bb4fb73546 100644 > --- a/toolchain/binutils/Makefile > +++ b/toolchain/binutils/Makefile > @@ -1,5 +1,5 @@ > # > -# Copyright (C) 2006-2013 OpenWrt.org > +# Copyright (C) 2006-2020 OpenWrt.org > # > # This is free software, licensed under the GNU General Public License v2. > # See /LICENSE for more information. > @@ -8,6 +8,7 @@ include $(TOPDIR)/rules.mk > > PKG_NAME:=binutils > PKG_VERSION:=$(call qstrip,$(CONFIG_BINUTILS_VERSION)) > +PKG_RELEASE:=1 > BIN_VERSION:=$(PKG_VERSION) > > PKG_SOURCE_URL:=@GNU/binutils/ > diff --git a/toolchain/gcc/common.mk b/toolchain/gcc/common.mk index > eb0ddbf2d9..b45e14770b 100644 > --- a/toolchain/gcc/common.mk > +++ b/toolchain/gcc/common.mk > @@ -2,7 +2,7 @@ > # Copyright (C) 2002-2003 Erik Andersen <andersen@uclibc.org> # Copyright > (C) 2004 Manuel Novoa III <mjn3@uclibc.org> # Copyright (C) 2005-2006 Felix > Fietkau <nbd@nbd.name> -# Copyright (C) 2006-2014 OpenWrt.org > +# Copyright (C) 2006-2020 OpenWrt.org > # > # 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 @@ - > 23,6 +23,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gcc > GCC_VERSION:=$(call qstrip,$(CONFIG_GCC_VERSION)) > PKG_VERSION:=$(firstword $(subst +, ,$(GCC_VERSION))) > +PKG_RELEASE:=1 > GCC_DIR:=$(PKG_NAME)-$(PKG_VERSION) > > PKG_SOURCE_URL:=@GNU/gcc/gcc-$(PKG_VERSION) > diff --git a/toolchain/gdb/Makefile b/toolchain/gdb/Makefile index > c25d181990..3452ac4dc7 100644 > --- a/toolchain/gdb/Makefile > +++ b/toolchain/gdb/Makefile > @@ -1,5 +1,5 @@ > # > -# Copyright (C) 2006-2016 OpenWrt.org > +# Copyright (C) 2006-2020 OpenWrt.org > # > # This is free software, licensed under the GNU General Public License v2. > # See /LICENSE for more information. > @@ -8,6 +8,7 @@ include $(TOPDIR)/rules.mk > > PKG_NAME:=gdb > PKG_VERSION:=8.3.1 > +PKG_RELEASE:=1 > > PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz > PKG_SOURCE_URL:=@GNU/gdb > diff --git a/toolchain/glibc/common.mk b/toolchain/glibc/common.mk index > 1a084d0862..9a9c4a5343 100644 > --- a/toolchain/glibc/common.mk > +++ b/toolchain/glibc/common.mk > @@ -1,5 +1,5 @@ > # > -# Copyright (C) 2006-2016 OpenWrt.org > +# Copyright (C) 2006-2020 OpenWrt.org > # > # This is free software, licensed under the GNU General Public License v2. > # See /LICENSE for more information. > @@ -8,6 +8,7 @@ include $(TOPDIR)/rules.mk > > PKG_NAME:=glibc > PKG_VERSION:=2.31 > +PKG_RELEASE:=1 > > PKG_SOURCE_PROTO:=git > PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) > diff --git a/toolchain/uClibc/common.mk b/toolchain/uClibc/common.mk > index 6f4c50c380..a79a838be4 100644 > --- a/toolchain/uClibc/common.mk > +++ b/toolchain/uClibc/common.mk > @@ -1,5 +1,5 @@ > # > -# Copyright (C) 2006-2012 OpenWrt.org > +# Copyright (C) 2006-2020 OpenWrt.org > # > # This is free software, licensed under the GNU General Public License v2. > # See /LICENSE for more information. > @@ -8,6 +8,7 @@ include $(TOPDIR)/rules.mk include > $(INCLUDE_DIR)/target.mk > > PKG_VERSION:=1.0.31 > +PKG_RELEASE:=1 > > PKG_NAME:=uClibc-ng > PKG_SOURCE_URL = http://downloads.uclibc- > ng.org/releases/$(PKG_VERSION)/ > -- > 2.25.1 > > > _______________________________________________ > openwrt-devel mailing list > openwrt-devel@lists.openwrt.org > https://lists.openwrt.org/mailman/listinfo/openwrt-devel
diff --git a/toolchain/binutils/Makefile b/toolchain/binutils/Makefile index c5c8bf588c..bb4fb73546 100644 --- a/toolchain/binutils/Makefile +++ b/toolchain/binutils/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2013 OpenWrt.org +# Copyright (C) 2006-2020 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,6 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=binutils PKG_VERSION:=$(call qstrip,$(CONFIG_BINUTILS_VERSION)) +PKG_RELEASE:=1 BIN_VERSION:=$(PKG_VERSION) PKG_SOURCE_URL:=@GNU/binutils/ diff --git a/toolchain/gcc/common.mk b/toolchain/gcc/common.mk index eb0ddbf2d9..b45e14770b 100644 --- a/toolchain/gcc/common.mk +++ b/toolchain/gcc/common.mk @@ -2,7 +2,7 @@ # Copyright (C) 2002-2003 Erik Andersen <andersen@uclibc.org> # Copyright (C) 2004 Manuel Novoa III <mjn3@uclibc.org> # Copyright (C) 2005-2006 Felix Fietkau <nbd@nbd.name> -# Copyright (C) 2006-2014 OpenWrt.org +# Copyright (C) 2006-2020 OpenWrt.org # # 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 @@ -23,6 +23,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gcc GCC_VERSION:=$(call qstrip,$(CONFIG_GCC_VERSION)) PKG_VERSION:=$(firstword $(subst +, ,$(GCC_VERSION))) +PKG_RELEASE:=1 GCC_DIR:=$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE_URL:=@GNU/gcc/gcc-$(PKG_VERSION) diff --git a/toolchain/gdb/Makefile b/toolchain/gdb/Makefile index c25d181990..3452ac4dc7 100644 --- a/toolchain/gdb/Makefile +++ b/toolchain/gdb/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2016 OpenWrt.org +# Copyright (C) 2006-2020 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,6 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gdb PKG_VERSION:=8.3.1 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@GNU/gdb diff --git a/toolchain/glibc/common.mk b/toolchain/glibc/common.mk index 1a084d0862..9a9c4a5343 100644 --- a/toolchain/glibc/common.mk +++ b/toolchain/glibc/common.mk @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2016 OpenWrt.org +# Copyright (C) 2006-2020 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,6 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=glibc PKG_VERSION:=2.31 +PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) diff --git a/toolchain/uClibc/common.mk b/toolchain/uClibc/common.mk index 6f4c50c380..a79a838be4 100644 --- a/toolchain/uClibc/common.mk +++ b/toolchain/uClibc/common.mk @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2012 OpenWrt.org +# Copyright (C) 2006-2020 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,6 +8,7 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/target.mk PKG_VERSION:=1.0.31 +PKG_RELEASE:=1 PKG_NAME:=uClibc-ng PKG_SOURCE_URL = http://downloads.uclibc-ng.org/releases/$(PKG_VERSION)/
The toolchain packages partly contain local code like patches and configuration files. These files are not tracked via PKG_VERSION as this variable only covers the upstream package version. To allow versioning of the buildsystem, this commit adds PKG_RELEASE:=1 to all toolchain packages with local files. Whenever a local file is changed the release must be increased. Also update the copyright of touched files to 2020. Signed-off-by: Paul Spooren <mail@aparcar.org> --- toolchain/binutils/Makefile | 3 ++- toolchain/gcc/common.mk | 3 ++- toolchain/gdb/Makefile | 3 ++- toolchain/glibc/common.mk | 3 ++- toolchain/uClibc/common.mk | 3 ++- 5 files changed, 10 insertions(+), 5 deletions(-)