Date: Wed, 16 Aug 2023 14:26:40 -0600 From: Warner Losh <imp@bsdimp.com> To: Ed Maste <emaste@freebsd.org> Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 90aad5d3e44d - main - makefs: clean up some leftovers after $FreeBSD$ tag removal Message-ID: <CANCZdfonDo_1n6kK=oYSvWSR2EJe67Vd5xYbvPzg_yiHdzST4g@mail.gmail.com> In-Reply-To: <202308162025.37GKPNrw029784@gitrepo.freebsd.org> References: <202308162025.37GKPNrw029784@gitrepo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --] On Wed, Aug 16, 2023 at 2:25 PM Ed Maste <emaste@freebsd.org> wrote: > The branch main has been updated by emaste: > > URL: > https://cgit.FreeBSD.org/src/commit/?id=90aad5d3e44d137ce80d2ec257de07c7c1367bd3 > > commit 90aad5d3e44d137ce80d2ec257de07c7c1367bd3 > Author: Ed Maste <emaste@FreeBSD.org> > AuthorDate: 2023-03-30 14:02:02 +0000 > Commit: Ed Maste <emaste@FreeBSD.org> > CommitDate: 2023-08-16 20:24:37 +0000 > > makefs: clean up some leftovers after $FreeBSD$ tag removal > > Fixes: 2a63c3be1582 > --- > usr.sbin/makefs/cd9660/Makefile.inc | 2 -- > usr.sbin/makefs/ffs/Makefile.inc | 2 -- > usr.sbin/makefs/msdos.c | 3 --- > usr.sbin/makefs/msdos/Makefile.inc | 2 -- > usr.sbin/makefs/tests/makefs_cd9660_tests.sh | 2 -- > usr.sbin/makefs/tests/makefs_ffs_tests.sh | 2 -- > usr.sbin/makefs/tests/makefs_tests_common.sh | 2 -- > 7 files changed, 15 deletions(-) > > diff --git a/usr.sbin/makefs/cd9660/Makefile.inc > b/usr.sbin/makefs/cd9660/Makefile.inc > index be08e8e34cd9..e596309a6243 100644 > --- a/usr.sbin/makefs/cd9660/Makefile.inc > +++ b/usr.sbin/makefs/cd9660/Makefile.inc > @@ -1,5 +1,3 @@ > -# > - > .PATH: ${SRCDIR}/cd9660 > > CFLAGS+=-I${SRCTOP}/sys/fs/cd9660/ > diff --git a/usr.sbin/makefs/ffs/Makefile.inc > b/usr.sbin/makefs/ffs/Makefile.inc > index bf62ac8bf926..0db1750ab282 100644 > --- a/usr.sbin/makefs/ffs/Makefile.inc > +++ b/usr.sbin/makefs/ffs/Makefile.inc > @@ -1,5 +1,3 @@ > -# > - > .PATH: ${SRCDIR}/ffs ${SRCTOP}/sys/ufs/ffs > SRCS+= ffs_alloc.c ffs_balloc.c ffs_bswap.c ffs_subr.c ufs_bmap.c > SRCS+= buf.c mkfs.c > diff --git a/usr.sbin/makefs/msdos.c b/usr.sbin/makefs/msdos.c > index 75aad6949203..8353f06315ac 100644 > --- a/usr.sbin/makefs/msdos.c > +++ b/usr.sbin/makefs/msdos.c > @@ -33,9 +33,6 @@ > #endif > > #include <sys/cdefs.h> > This should have likely been deleted as well... I'll add it to the fix for the other minor issues people are coming in with. Warner > -#if defined(__RCSID) && !defined(__lint) > -#endif /* !__lint */ > - > #include <sys/param.h> > > #if !HAVE_NBTOOL_CONFIG_H > diff --git a/usr.sbin/makefs/msdos/Makefile.inc > b/usr.sbin/makefs/msdos/Makefile.inc > index 3fb55c5394fc..78ddc7804b31 100644 > --- a/usr.sbin/makefs/msdos/Makefile.inc > +++ b/usr.sbin/makefs/msdos/Makefile.inc > @@ -1,5 +1,3 @@ > -# > - > MSDOS= ${SRCTOP}/sys/fs/msdosfs > MSDOS_NEWFS= ${SRCTOP}/sbin/newfs_msdos > > diff --git a/usr.sbin/makefs/tests/makefs_cd9660_tests.sh > b/usr.sbin/makefs/tests/makefs_cd9660_tests.sh > index 3f9b37abee4c..2fdf47f76a4c 100644 > --- a/usr.sbin/makefs/tests/makefs_cd9660_tests.sh > +++ b/usr.sbin/makefs/tests/makefs_cd9660_tests.sh > @@ -23,8 +23,6 @@ > # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT > # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE > # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. > -# > -# > > # A note on specs: > # - A copy of the ISO-9660 spec can be found here: > diff --git a/usr.sbin/makefs/tests/makefs_ffs_tests.sh > b/usr.sbin/makefs/tests/makefs_ffs_tests.sh > index fafec4c885fb..2505b2e24d72 100644 > --- a/usr.sbin/makefs/tests/makefs_ffs_tests.sh > +++ b/usr.sbin/makefs/tests/makefs_ffs_tests.sh > @@ -23,8 +23,6 @@ > # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT > # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE > # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. > -# > -# > > MAKEFS="makefs -t ffs" > MOUNT="mount" > diff --git a/usr.sbin/makefs/tests/makefs_tests_common.sh > b/usr.sbin/makefs/tests/makefs_tests_common.sh > index 08f687fa44a4..12c7c7c84fb7 100644 > --- a/usr.sbin/makefs/tests/makefs_tests_common.sh > +++ b/usr.sbin/makefs/tests/makefs_tests_common.sh > @@ -23,8 +23,6 @@ > # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT > # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE > # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. > -# > -# > > KB=1024 > : ${TMPDIR=/tmp} > [-- Attachment #2 --] <div dir="ltr"><div dir="ltr"><br></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Wed, Aug 16, 2023 at 2:25 PM Ed Maste <<a href="mailto:emaste@freebsd.org">emaste@freebsd.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">The branch main has been updated by emaste:<br> <br> URL: <a href="https://cgit.FreeBSD.org/src/commit/?id=90aad5d3e44d137ce80d2ec257de07c7c1367bd3" rel="noreferrer" target="_blank">https://cgit.FreeBSD.org/src/commit/?id=90aad5d3e44d137ce80d2ec257de07c7c1367bd3</a><br>; <br> commit 90aad5d3e44d137ce80d2ec257de07c7c1367bd3<br> Author: Ed Maste <emaste@FreeBSD.org><br> AuthorDate: 2023-03-30 14:02:02 +0000<br> Commit: Ed Maste <emaste@FreeBSD.org><br> CommitDate: 2023-08-16 20:24:37 +0000<br> <br> makefs: clean up some leftovers after $FreeBSD$ tag removal<br> <br> Fixes: 2a63c3be1582<br> ---<br> usr.sbin/makefs/cd9660/Makefile.inc | 2 --<br> usr.sbin/makefs/ffs/Makefile.inc | 2 --<br> usr.sbin/makefs/msdos.c | 3 ---<br> usr.sbin/makefs/msdos/Makefile.inc | 2 --<br> usr.sbin/makefs/tests/makefs_cd9660_tests.sh | 2 --<br> usr.sbin/makefs/tests/makefs_ffs_tests.sh | 2 --<br> usr.sbin/makefs/tests/makefs_tests_common.sh | 2 --<br> 7 files changed, 15 deletions(-)<br> <br> diff --git a/usr.sbin/makefs/cd9660/Makefile.inc b/usr.sbin/makefs/cd9660/Makefile.inc<br> index be08e8e34cd9..e596309a6243 100644<br> --- a/usr.sbin/makefs/cd9660/Makefile.inc<br> +++ b/usr.sbin/makefs/cd9660/Makefile.inc<br> @@ -1,5 +1,3 @@<br> -#<br> -<br> .PATH: ${SRCDIR}/cd9660<br> <br> CFLAGS+=-I${SRCTOP}/sys/fs/cd9660/<br> diff --git a/usr.sbin/makefs/ffs/Makefile.inc b/usr.sbin/makefs/ffs/Makefile.inc<br> index bf62ac8bf926..0db1750ab282 100644<br> --- a/usr.sbin/makefs/ffs/Makefile.inc<br> +++ b/usr.sbin/makefs/ffs/Makefile.inc<br> @@ -1,5 +1,3 @@<br> -#<br> -<br> .PATH: ${SRCDIR}/ffs ${SRCTOP}/sys/ufs/ffs<br> SRCS+= ffs_alloc.c ffs_balloc.c ffs_bswap.c ffs_subr.c ufs_bmap.c<br> SRCS+= buf.c mkfs.c<br> diff --git a/usr.sbin/makefs/msdos.c b/usr.sbin/makefs/msdos.c<br> index 75aad6949203..8353f06315ac 100644<br> --- a/usr.sbin/makefs/msdos.c<br> +++ b/usr.sbin/makefs/msdos.c<br> @@ -33,9 +33,6 @@<br> #endif<br> <br> #include <sys/cdefs.h><br></blockquote><div><br></div><div>This should have likely been deleted as well... I'll add it to the fix for the other minor issues people are coming in with.</div><div><br></div><div>Warner</div><div> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"> -#if defined(__RCSID) && !defined(__lint)<br> -#endif /* !__lint */<br> -<br> #include <sys/param.h><br> <br> #if !HAVE_NBTOOL_CONFIG_H<br> diff --git a/usr.sbin/makefs/msdos/Makefile.inc b/usr.sbin/makefs/msdos/Makefile.inc<br> index 3fb55c5394fc..78ddc7804b31 100644<br> --- a/usr.sbin/makefs/msdos/Makefile.inc<br> +++ b/usr.sbin/makefs/msdos/Makefile.inc<br> @@ -1,5 +1,3 @@<br> -#<br> -<br> MSDOS= ${SRCTOP}/sys/fs/msdosfs<br> MSDOS_NEWFS= ${SRCTOP}/sbin/newfs_msdos<br> <br> diff --git a/usr.sbin/makefs/tests/makefs_cd9660_tests.sh b/usr.sbin/makefs/tests/makefs_cd9660_tests.sh<br> index 3f9b37abee4c..2fdf47f76a4c 100644<br> --- a/usr.sbin/makefs/tests/makefs_cd9660_tests.sh<br> +++ b/usr.sbin/makefs/tests/makefs_cd9660_tests.sh<br> @@ -23,8 +23,6 @@<br> # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT<br> # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE<br> # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.<br> -#<br> -#<br> <br> # A note on specs:<br> # - A copy of the ISO-9660 spec can be found here:<br> diff --git a/usr.sbin/makefs/tests/makefs_ffs_tests.sh b/usr.sbin/makefs/tests/makefs_ffs_tests.sh<br> index fafec4c885fb..2505b2e24d72 100644<br> --- a/usr.sbin/makefs/tests/makefs_ffs_tests.sh<br> +++ b/usr.sbin/makefs/tests/makefs_ffs_tests.sh<br> @@ -23,8 +23,6 @@<br> # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT<br> # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE<br> # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.<br> -#<br> -#<br> <br> MAKEFS="makefs -t ffs"<br> MOUNT="mount"<br> diff --git a/usr.sbin/makefs/tests/makefs_tests_common.sh b/usr.sbin/makefs/tests/makefs_tests_common.sh<br> index 08f687fa44a4..12c7c7c84fb7 100644<br> --- a/usr.sbin/makefs/tests/makefs_tests_common.sh<br> +++ b/usr.sbin/makefs/tests/makefs_tests_common.sh<br> @@ -23,8 +23,6 @@<br> # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT<br> # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE<br> # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.<br> -#<br> -#<br> <br> KB=1024<br> : ${TMPDIR=/tmp}<br> </blockquote></div></div>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CANCZdfonDo_1n6kK=oYSvWSR2EJe67Vd5xYbvPzg_yiHdzST4g>