Date: Fri, 26 Jul 2019 05:23:45 +0200 From: Emmanuel Vadot <manu@bidouilliste.com> To: Guido Falsi <madpilot@FreeBSD.org> Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r350135 - head/share/mk Message-ID: <20190726052345.560b122cf2714bef73a2bf4f@bidouilliste.com> In-Reply-To: <0e851350-0967-ee2b-3655-b79d9abd38ed@FreeBSD.org> References: <201907191511.x6JFBWVi053537@repo.freebsd.org> <37944eff-6e00-df14-59d3-beae3fa89b6a@FreeBSD.org> <28eb9717-533e-3d87-0e30-f60317ed97cb@FreeBSD.org> <20190726051042.fcc4f6d969e19fb6f480977b@bidouilliste.com> <0e851350-0967-ee2b-3655-b79d9abd38ed@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Fri, 26 Jul 2019 14:58:01 +0200 Guido Falsi <madpilot@FreeBSD.org> wrote: > On 26/07/19 05:10, Emmanuel Vadot wrote: > > On Thu, 25 Jul 2019 00:17:31 +0200 > > Guido Falsi <madpilot@FreeBSD.org> wrote: > > > >> On 25/07/19 00:14, Guido Falsi wrote: > >>> On 19/07/19 17:11, Emmanuel Vadot wrote: > >>>> Author: manu > >>>> Date: Fri Jul 19 15:11:32 2019 > >>>> New Revision: 350135 > >>>> URL: https://svnweb.freebsd.org/changeset/base/350135 > >>>> > >>>> Log: > >>>> bsd.confs.mk: Test the correct value for the destination package > >>>> > >>>> Reviewed by: bapt, gjb > >>>> Differential Revision: https://reviews.freebsd.org/D20961 > >>>> > >>> > >>> Hello, > >>> > >>> I don't know the actual workings of this file and have not checked it in > >>> depth, but this change is causing "make package" to not package > >>> /etc/rc.d/sshd (and others, all the ones being defined in > >>> ${group}PACKAGE variables), which are then missing when upgrading machines. > >>> > >>> Reverting this change makes packaging things work again. I think this > >>> change is actually wrong and the previous version was correct. > >>> > > > > /etc/rc.d/sshd is in the FreeBSD-sshd package, the other ones are also > > in their own package now, I'll check them all to see if that make sense. > > It makes perfect sense for that file to be in the FreeBSD-sshd package > and that was my first guess when looking for the missing file, but in my > case it was not present in that package. > > By reverting your change it appears to end up in the FreeBSD-runtime > package. Fresh build from today : elbarto@wopr> tar tzf FreeBSD-ssh-13.0.s20190726081149.txz /etc/rc.d/sshd /etc/rc.d/sshd elbarto@wopr> tar xzf FreeBSD-ssh-13.0.s20190726081149.txz +MANIFEST elbarto@wopr> jq < +MANIFEST | grep sshd "/etc/rc.d/sshd": "1$09d051563f89dbae0f54af42add15f9c16d5bf5c63a32d8eadc5127f665e4de9", "/etc/ssh/sshd_config": "1$7501d70e5186360c812b55cf0f0caff51169ca6764222f3fa668c09e8b5823a8", "/usr/sbin/sshd": "1$85772d32ba83cf6edd190fe48e949a358b08079a1dcc2c6a0de9addfe5075829", "/usr/share/man/man5/sshd_config.5.gz": "1$593bcd2338b124faf735825c52da8d9534f3e4b326a573590e8625f364017b57", "/usr/share/man/man8/sshd.8.gz": "1$729b894da4fa632be0ca6e06897943caca0e9d699a8a3c0ed33393e0b7ecec44", "/etc/rc.d/sshd", "/etc/ssh/sshd_config" > > > >> After sending this message I also noticed, it causes the spurious > >> "FreeBSD-zfs" package to be generated again. > > > > Not so spurious, it now contains the rc.d zfs related files. > > I think that I'll remove it anyway, it doesn't make sense. > > It does, but, again reverting your change, those files end up in the > runtime package. Yes reverting make those files end up in the runtime package, aka the default package used when no packages are specified. The change is good but will needs more tweaking in libexec/rc.d/Makefile so files endup when it make sense. > -- > Guido Falsi <madpilot@FreeBSD.org> -- Emmanuel Vadot <manu@bidouilliste.com> <manu@freebsd.org>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20190726052345.560b122cf2714bef73a2bf4f>