Il giorno sab 6 apr 2024 alle ore 21:46 Hartmut Birr <osexp...@gmail.com> ha scritto: > > Hi, > > I did change the Makefile for dnsmasq in the way that I give: > > PKG_SOURCE_URL:=git://thekelleys.org.uk/dnsmasq.git > PKG_SOURCE_PROTO:=git > PKG_SOURCE_DATE:=2024-03-27 > PKG_SOURCE_VERSION:=550c368adea12b312f83686c61f9015c122046c2 # Treat cache > insertion failure of DNSKEY and DS records as another resource problem and > fail validation with suitable logging. > PKG_MIRROR_HASH:=284a34bdb967ec8a9dff132df065ca64e9a1819d79bb8cecee1af001e22d626c > > Before changing to zstd, the generated source tar ball contains a file > 'VERSION' with content '$Format:%d$'. This does match the dnsmasq git > repository. After changing to zstd, VERSION contains ' (HEAD, origin/master, > origin/HEAD, master)'. > > Any idea why VERSION is manipulated? > > I generate automatically a patch which modifies VERSION to see the commit > hash via logread. Applying the patch doesn't work any more. > > dnsmasq/patches/999-dnsmasq-version.patch: > diff --git a/VERSION b/VERSION > index 998eb1f..9977908 100644 > --- a/VERSION > +++ b/VERSION > @@ -1 +1 @@ > -$Format:%d$ > + (master, v2.90deb2-8-g550c368, head) >
Hi, thanks for pointing this out, although your situation is special and a downstream situation it was worth investigating it. We confirmed that the change is correct and this is expected and it was actually wrong previously. The format works and requires an associated tag to the commit. Passing an untagged hash results in what you are observing. This is git archive handling and nothing done wrong on our hand. Soo your solution was working due to us doing things in a special way (and ignoring .gitattributes) A more robust solution (and what I'm suggesting you to change), is to make use of the Prepare define and just remove the VERSION file and generate one of your own. It should permit you to make things more maintainable and even remove the downstream patch. _______________________________________________ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
