| Message ID | 20200422180300.14712-1-freifunk@adrianschmutzler.de |
|---|---|
| State | Rejected |
| Headers | show |
diff --git a/src/packages/fff/fff-macnock/Makefile b/src/packages/fff/fff-macnock/Makefile index 0e45b38a..7ed5c83e 100644 --- a/src/packages/fff/fff-macnock/Makefile +++ b/src/packages/fff/fff-macnock/Makefile @@ -1,15 +1,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=fff-macnock -PKG_VERSION:=0.1 PKG_RELEASE:=1 -PKG_REV:=ffd1a64515709d75afaab0f990308fd164dc4cc6 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_SOURCE_URL:=https://github.com/FreifunkFranken/macnocker.git PKG_SOURCE_PROTO:=git -PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE_VERSION:=$(PKG_REV) +PKG_SOURCE_URL:=https://github.com/FreifunkFranken/macnocker.git +PKG_SOURCE_DATE:=2018-04-03 +PKG_SOURCE_VERSION:=ffd1a64515709d75afaab0f990308fd164dc4cc6 +PKG_MIRROR_HASH:=f0c251399613c86b505312d87b4132b4eaf0b1a910b9a6503b9d82ab5056978d include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/cmake.mk
Hallo Adrian, was genau haben wir vom PKG_SOURCE_DATE und vor allem PKG_MIRROR_HASH? Wenn ich das richtig verstehe ist das für uns nicht interessant, solange wir keinen Buildserver haben, der diese tarballs generiert und bereitstellt? In so fern wäre es also erstmal nur zusätzliche Arbeit die Dinger jedes mal zu erzeugen und einzufügen.. Gruß Fabian On 22.04.20 20:03, Adrian Schmutzler wrote: > This removes unnecessary package variables and rearranges the > remaining ones based on the common style in OpenWrt trunk. > > In particular, this drops PKG_VERSION in favor of PKG_SOURCE_DATE, > since it does not seem reasonable to tag a version every time we > want to pull it. Despite, while we effectively pull via the > variable PKG_SOURCE_VERSION anyway, the PKG_VERSION might even > have hidden changes if not properly adjusted. > > This also adds the PKG_MIRROR_HASH commonly used for OpenWrt > packages. After having changed the PKG_SOURCE_VERSION, it can > be easily created by: > > make package/fff-macnock/download > make package/fff-macnock/check V=s FIXUP=1 > > Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> > > --- > > Not tested. > > Changes in v2: > added PKG_MIRROR_HASH > --- > src/packages/fff/fff-macnock/Makefile | 10 ++++------ > 1 file changed, 4 insertions(+), 6 deletions(-) > > diff --git a/src/packages/fff/fff-macnock/Makefile b/src/packages/fff/fff-macnock/Makefile > index 0e45b38a..7ed5c83e 100644 > --- a/src/packages/fff/fff-macnock/Makefile > +++ b/src/packages/fff/fff-macnock/Makefile > @@ -1,15 +1,13 @@ > include $(TOPDIR)/rules.mk > > PKG_NAME:=fff-macnock > -PKG_VERSION:=0.1 > PKG_RELEASE:=1 > -PKG_REV:=ffd1a64515709d75afaab0f990308fd164dc4cc6 > > -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 > -PKG_SOURCE_URL:=https://github.com/FreifunkFranken/macnocker.git > PKG_SOURCE_PROTO:=git > -PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) > -PKG_SOURCE_VERSION:=$(PKG_REV) > +PKG_SOURCE_URL:=https://github.com/FreifunkFranken/macnocker.git > +PKG_SOURCE_DATE:=2018-04-03 > +PKG_SOURCE_VERSION:=ffd1a64515709d75afaab0f990308fd164dc4cc6 > +PKG_MIRROR_HASH:=f0c251399613c86b505312d87b4132b4eaf0b1a910b9a6503b9d82ab5056978d > > include $(INCLUDE_DIR)/package.mk > include $(INCLUDE_DIR)/cmake.mk >
Hallo Fabian, das PKG_SOURCE_DATE wird als Versionsnummer mit für Dateinamen verwendet (z.B. dl/fff-macnock-2018-04-03-ffd1a645.tar.xz). Das ist einfach etwas angenehmer zu handeln als wenn da nur der commit-hash steht (auch für die Person, die in den Makefile kuckt). Ich weiß nicht, ob es ohne SOURCE_DATE auch funktioniert und habe es auch nicht versucht. Primär wollte ich PKG_VERSION loswerden. Beim PKG_MIRROR_HASH hatte ich gedacht, dass der auch unseren download nochmal gegen die checksumme prüft (und ggf. weint). Da es aber scheinbar so ist, wie du schreibst, macht der PKG_MIRROR_HASH dann eigentlich keinen Sinn (und ist im Prinzip kontraproduktiv) und du kannst wieder die v1 von dem Patch nehmen. Grüße Adrian
This removes unnecessary package variables and rearranges the remaining ones based on the common style in OpenWrt trunk. In particular, this drops PKG_VERSION in favor of PKG_SOURCE_DATE, since it does not seem reasonable to tag a version every time we want to pull it. Despite, while we effectively pull via the variable PKG_SOURCE_VERSION anyway, the PKG_VERSION might even have hidden changes if not properly adjusted. This also adds the PKG_MIRROR_HASH commonly used for OpenWrt packages. After having changed the PKG_SOURCE_VERSION, it can be easily created by: make package/fff-macnock/download make package/fff-macnock/check V=s FIXUP=1 Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> --- Not tested. Changes in v2: added PKG_MIRROR_HASH --- src/packages/fff/fff-macnock/Makefile | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)