On Sat, 6 Apr 2024 at 21:47, Hartmut Birr <osexp...@gmail.com> wrote: > > 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 Hartmut, We are now using git-archive to make a tarball of git repositories in order to make them reproducible which fixes a long standing issue. git-archive respects .gitattributes so that along with: https://github.com/imp/dnsmasq/commit/2aaea18f432374fd062370f2d899e47849558b2f Is most likely the cause. Regards, Robert > Regards, > Hartmut > > _______________________________________________ > openwrt-devel mailing list > openwrt-devel@lists.openwrt.org > https://lists.openwrt.org/mailman/listinfo/openwrt-devel _______________________________________________ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
