diff --git a/.gitignore b/.gitignore index 47d17ae16d34..a2cb92dd5406 100644 --- a/.gitignore +++ b/.gitignore @@ -1,89 +1,90 @@ # # This is the top-level .gitignore file: # ignore everything except a list of allowed files. # # This is not the place for entries that are specific to # a subdirectory. Instead add those files to the # .gitignore file in that subdirectory. # # N.B. # Please use 'git ls-files -i --exclude-standard' # command after changing this file, to see if there are # any tracked files which get ignored after the change. * !.github !cmd !config !contrib !etc !include !lib !man !module !rpm !scripts !tests !udev !.github/** !cmd/** !config/** !contrib/** !etc/** !include/** !lib/** !man/** !module/** !rpm/** !scripts/** !tests/** !udev/** !.editorconfig !.cirrus.yml !.gitignore !.gitmodules !.mailmap !AUTHORS !autogen.sh !CODE_OF_CONDUCT.md !configure.ac !copy-builtin !COPYRIGHT !LICENSE !Makefile.am !META !NEWS !NOTICE !README.md !RELEASES.md !TEST !zfs.release.in # # Normal rules # *.[oa] *.o.ur-safe *.lo *.la *.mod.c *~ *.swp *.gcno *.gcda *.pyc *.pyo .deps .libs .dirstamp .DS_Store modules.order Makefile Makefile.in +changelog *.patch *.orig *.tmp *.log diff --git a/configure.ac b/configure.ac index 4c75616e4299..f31fe1db81e4 100644 --- a/configure.ac +++ b/configure.ac @@ -1,88 +1,89 @@ /* * This file is part of OpenZFS. * * Copyright (c) 2009 Lawrence Livermore National Security, LLC. * Produced at Lawrence Livermore National Laboratory * Written by: * Brian Behlendorf , * Herb Wartens , * Jim Garlick * LLNL-CODE-403049 * * CDDL HEADER START * * The contents of this file are subject to the terms of the * Common Development and Distribution License, Version 1.0 only * (the "License"). You may not use this file except in compliance * with the License. * * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE * or https://opensource.org/licenses/CDDL-1.0. * See the License for the specific language governing permissions * and limitations under the License. * * When distributing Covered Code, include this CDDL HEADER in each * file and include the License file at usr/src/OPENSOLARIS.LICENSE. * If applicable, add the following below this CDDL HEADER, with the * fields enclosed by brackets "[]" replaced with your own identifying * information: Portions Copyright [yyyy] [name of copyright owner] * * CDDL HEADER END */ AC_INIT(m4_esyscmd(awk '/^Name:/ {printf $2}' META), m4_esyscmd(awk '/^Version:/ {printf $2}' META)) CFGOPTS="$*" AC_LANG(C) ZFS_AC_META AC_CONFIG_AUX_DIR([config]) AC_CONFIG_MACRO_DIR([config]) AC_CANONICAL_TARGET AM_MAINTAINER_MODE m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) AM_INIT_AUTOMAKE([subdir-objects foreign]) # Remove default macros from config.h: # PACKAGE, PACKAGE_{BUGREPORT,NAME,STRING,TARNAME,VERSION}, STDC_HEADERS, VERSION AC_CONFIG_HEADERS([zfs_config.h], [ sed -nri~ -e '/^$/be' -e 'N;N;/#define (PACKAGE|VERSION|STDC_HEADERS)/d' -e ':e' -e 'p' zfs_config.h && rm zfs_config.h~ || exit]) LT_INIT AC_PROG_INSTALL AC_PROG_CC AC_PROG_LN_S PKG_PROG_PKG_CONFIG AM_PROG_AS AM_PROG_CC_C_O AX_CODE_COVERAGE _AM_PROG_TAR(pax) ZFS_AC_LICENSE ZFS_AC_CONFIG ZFS_AC_PACKAGE ZFS_AC_DEBUG ZFS_AC_DEBUGINFO ZFS_AC_DEBUG_KMEM ZFS_AC_DEBUG_KMEM_TRACKING ZFS_AC_DEBUG_INVARIANTS AC_CONFIG_FILES([ contrib/debian/rules + contrib/debian/changelog Makefile include/Makefile lib/libzfs/libzfs.pc lib/libzfs_core/libzfs_core.pc lib/libzfsbootenv/libzfsbootenv.pc module/Kbuild module/Makefile rpm/generic/zfs-dkms.spec rpm/generic/zfs-kmod.spec rpm/generic/zfs.spec rpm/redhat/zfs-dkms.spec rpm/redhat/zfs-kmod.spec rpm/redhat/zfs.spec tests/zfs-tests/tests/Makefile zfs.release ]) AC_OUTPUT diff --git a/contrib/debian/changelog b/contrib/debian/changelog.in similarity index 74% rename from contrib/debian/changelog rename to contrib/debian/changelog.in index ba42ea59fa8d..525519a73d08 100644 --- a/contrib/debian/changelog +++ b/contrib/debian/changelog.in @@ -1,13 +1,19 @@ +openzfs-linux (@VERSION@-1) unstable; urgency=low + + * OpenZFS @VERSION@ is tagged. + + -- Umer Saleem Wed, 15 Nov 2023 15:00:00 +0500 + openzfs-linux (2.2.0-0) unstable; urgency=low * OpenZFS 2.2.0 is tagged. -- Umer Saleem Tue, 25 Jul 2023 15:00:00 +0500 openzfs-linux (2.1.99-1) unstable; urgency=low * Integrate minimally modified Debian packaging from ZFS on Linux (source: https://salsa.debian.org/zfsonlinux-team/zfs) * This packaging is a fork of Debian zfs-linux 2.1.6-2 release. -- Umer Saleem Fri, 11 Oct 2022 15:00:00 -0400