alvistack/v80

    git clean -xdf
    tar zcvf ../ndctl_80.orig.tar.gz --exclude=.git .
    debuild -uc -us
    cp ndctl.spec ../ndctl_80-1.spec
    cp ndctl.rpmlintrc /osc/home\:alvistack/pmem-ndctl-80/
    cp ../ndctl*80*.{gz,xz,spec,dsc} /osc/home\:alvistack/pmem-ndctl-80/
    rm -rf ../*ndctl*80*.* ../*daxctl*80*.* ../*libcxl*80*.*

See pmem#267
See pmem#268

Signed-off-by: Wong Hoi Sing Edison <[email protected]>

cxl/json.c

@@ -9,7 +9,7 @@
 #include <json-c/json.h>
 #include <json-c/printbuf.h>
 #include <ccan/short_types/short_types.h>
-#include <tracefs/tracefs.h>
+#include <tracefs.h>
 
 #include "filter.h"
 #include "json.h"

cxl/lib/libcxl.sym

@@ -208,7 +208,6 @@ global:
 	cxl_mapping_get_first;
 	cxl_mapping_get_next;
 	cxl_mapping_get_decoder;
-	cxl_mapping_get_region;
 	cxl_mapping_get_position;
 	cxl_decoder_get_by_name;
 	cxl_decoder_get_memdev;

cxl/libcxl.h

@@ -354,7 +354,6 @@ struct cxl_memdev_mapping *cxl_mapping_get_first(struct cxl_region *region);
 struct cxl_memdev_mapping *
 cxl_mapping_get_next(struct cxl_memdev_mapping *mapping);
 struct cxl_decoder *cxl_mapping_get_decoder(struct cxl_memdev_mapping *mapping);
-struct cxl_region *cxl_mapping_get_region(struct cxl_memdev_mapping *mapping);
 unsigned int cxl_mapping_get_position(struct cxl_memdev_mapping *mapping);
 
 #define cxl_mapping_foreach(region, mapping) \

debian/.gitignore

@@ -0,0 +1,13 @@
+*.substvars
+*debhelper*
+.debhelper
+files
+tmp
+daxctl
+libcxl-dev
+libcxl1
+libdaxctl-dev
+libdaxctl1
+libndctl-dev
+libndctl6
+ndctl

debian/90-daxctl-device.rules

@@ -0,0 +1,2 @@
+ACTION=="add", SUBSYSTEM=="dax",\
+  RUN+="/usr/bin/daxctl -C $env{DEVNAME}"

debian/changelog

@@ -0,0 +1,5 @@
+ndctl (100:80-1) UNRELEASED; urgency=medium
+
+  * https://github.com/pmem/ndctl/releases/tag/v80
+
+ -- Wong Hoi Sing Edison <[email protected]>  Fri, 11 Oct 2024 14:08:08 +0800

debian/control

@@ -0,0 +1,115 @@
+Source: ndctl
+Maintainer: Ubuntu Developers <[email protected]>
+XSBC-Original-Maintainer: Adam Borowski <[email protected]>
+Section: libs
+Priority: optional
+Standards-Version: 4.5.0
+Build-Depends: debhelper-compat (= 10),
+               debhelper,
+               pkg-config,
+               libkmod-dev,
+               libudev-dev,
+               libtracefs-dev,
+               uuid-dev,
+               libjson-c-dev,
+               bash-completion,
+               libkeyutils-dev,
+               libiniparser-dev,
+               meson,
+               cmake,
+Rules-Requires-Root: no
+Homepage: https://github.com/pmem/ndctl/tags
+Vcs-Git: https://github.com/kilobyte/ndctl -b debian
+Vcs-Browser: https://github.com/kilobyte/ndctl/tree/debian
+
+Package: ndctl
+Section: misc
+Architecture: linux-any
+Multi-Arch: foreign
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+# RPM-world's name for cxl tools
+Provides: cxl-cli
+Description: Utility for managing the nvdimm subsystem
+ The nvdimm subsystem defines a kernel device model and control message
+ interface for platform NVDIMM resources like those defined by the ACPI 6+ NFIT
+ (NVDIMM Firmware Interface Table).
+ .
+ This package contains a utility for managing the nvdimm (non-volatile memory
+ device) subsystem in the Linux kernel.
+
+Package: libndctl6
+Architecture: linux-any
+Multi-Arch: same
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Utility library for managing the libnvdimm subsystem
+ The nvdimm subsystem defines a kernel device model and control message
+ interface for platform NVDIMM resources like those defined by the ACPI 6+ NFIT
+ (NVDIMM Firmware Interface Table).
+ .
+ This package contains a utility library for managing the libnvdimm
+ (non-volatile memory device) sub-system in the Linux kernel.
+
+Package: libndctl-dev
+Section: libdevel
+Architecture: linux-any
+Multi-Arch: same
+Depends: libndctl6 (= ${binary:Version}), ${misc:Depends}
+Description: Development files for libndctl
+ Header files and development library for compiling C programs to link
+ with the libndctl library and manage the libnvdimm sub-system in the
+ Linux kernel.
+
+Package: daxctl
+Section: misc
+Architecture: linux-any
+Multi-Arch: foreign
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Utility for managing the device DAX subsystem
+ "DAX" are file system extensions to bypass the page cache and block layer to
+ mmap persistent memory, from a PMEM block device, directly into a process
+ address space.
+ .
+ This package contains a utility for managing the device DAX subsystem in the
+ Linux kernel.
+
+Package: libdaxctl1
+Architecture: linux-any
+Multi-Arch: same
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Utility library for managing the device DAX subsystem
+ "DAX" are file system extensions to bypass the page cache and block layer to
+ mmap persistent memory, from a PMEM block device, directly into a process
+ address space.
+ .
+ This package contains a utility library used by applications to manage the
+ device DAX subsystem in the Linux kernel.
+
+Package: libdaxctl-dev
+Section: libdevel
+Architecture: linux-any
+Multi-Arch: same
+Depends: libdaxctl1 (= ${binary:Version}), ${misc:Depends}
+Description: Development files for libdaxctl
+ Header files and development library for compiling C programs to link
+ with the libdaxctl library and manage the device DAX subsystem in the
+ Linux kernel.
+
+Package: libcxl1
+Architecture: linux-any
+Multi-Arch: same
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: utility library for managing Compute Express Link devices
+ CXL (Compute Express Link) is a family of PCIe-based protocols that can be
+ used to connect high-speed I/O and memory devices.  This library includes
+ code to enumerate/query/configure such devices.
+
+Package: libcxl-dev
+Section: libdevel
+Architecture: linux-any
+Multi-Arch: same
+Depends: libcxl1 (= ${binary:Version}), ${misc:Depends}
+Description: Development files for libcxl
+ Header files and development library for compiling C programs to link
+ with the libcxl library and manage the Compute Express Link subsystem in
+ the Linux kernel.

debian/copyright

@@ -0,0 +1,199 @@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: ndctl
+Source: https://github.com/pmem/ndctl
+Copyright: 2013-2018 Intel Corporation
+License: LGPL-2.1
+
+Files:     *
+Copyright: 2014-2018 Intel Corporation
+License:   LGPL-2.1
+
+Files:     test.h
+           daxctl/list.c
+Copyright: (c) 2015-2017 Intel Corporation
+           (c) 2013-2016 Intel Corporation
+License:   GPL-2
+
+Files:     ccan/*
+Copyright: Unknown
+License:   CC0-1.0
+
+Files:     ccan/list/*
+Copyright: Unknown
+License:   Expat
+
+Files:     daxctl/daxctl.c
+Copyright: (c) 2005 Andreas Ericsson.
+           (c) 2015-2017 Intel Corporation. All rights reserved
+License:   GPL-2
+
+Files:     daxctl/libdaxctl.h
+           daxctl/lib/libdaxctl-private.h
+           daxctl/lib/libdaxctl.c
+Copyright: (c) 2016, Intel Corporation.
+           (c) 2014-2016, Intel Corporation.
+License:   LGPL-2.1
+
+Files:     ndctl/dimm.c
+           ndctl/lib/ars.c
+           ndctl/lib/dimm.c
+           ndctl/lib/hpe1.c
+           ndctl/lib/hpe1.h
+           ndctl/lib/inject.c
+           ndctl/lib/intel.c
+           ndctl/lib/intel.h
+           ndctl/lib/libndctl.c
+           ndctl/lib/msft.c
+           ndctl/lib/msft.h
+           ndctl/lib/nfit.c
+           ndctl/lib/private.h
+           ndctl/lib/smart.c
+           ndctl/libndctl-nfit.h
+           ndctl/libndctl.h
+           ndctl/namespace.h
+           ndctl/ndctl.h
+Copyright: 2014-2015, Intel Corporation.
+           2014-2016, Intel Corporation.
+           2014-2017, Intel Corporation.
+           2016, Hewlett Packard Enterprise Development LP
+           2016, Intel Corporation.
+           2016-2017, Dell, Inc.
+           2016-2017, Intel Corporation.
+           2017, FUJITSU LIMITED.
+           2017, Hewlett Packard Enterprise Development LP
+           2017, Intel Corporation.
+License:   LGPL-2.1
+
+Files:     ndctl/inject-error.c
+           ndctl/list.c
+           ndctl/namespace.c
+           ndctl/region.c
+           ndctl/test.c
+           ndctl/inject-smart.c
+           ndctl/lib/firmware.c
+           ndctl/bat.c
+           ndctl/create-nfit.c
+           ndctl/check.c
+           ndctl/action.h
+           ndctl/bus.c
+Copyright: (c) 2015-2017 Intel Corporation.
+           (c) 2015-2016 Intel Corporation.
+           (c) 2018 Intel Corporation.
+           (c) 2014 Intel Corporation.
+License:   GPL-2
+
+Files:     ndctl/ndctl.c
+Copyright: (c) 2005 Andreas Ericsson.
+           (c) 2015-2017 Intel Corporation.
+License:   GPL-2
+
+Files:     util/*
+Copyright: (c) 2015-2017 Intel Corporation.
+           (c) 2005 Junio C Hamano.
+           (c) 2005 Linus Torvalds.
+           (c) 2006 Linus Torvalds.
+           (c) 2007 Pierre Habouzit.
+           (c) 2008 Miklos Vajna.
+           (c) 2009 Akinobu Mita.
+License:   GPL-2
+
+Files:     util/log.c
+           util/log.h
+           util/sysfs.c
+           util/sysfs.h
+Copyright: 2014-2016, Intel Corporation.
+           2016, Intel Corporation.
+License:   LGPL-2.1
+
+Files:     Documentation/*
+Copyright: 2005, Jonas Fonseca
+           2005, Sergey Vlasov
+           (c) 2017, Intel Corporation
+           (c) 2016 - 2017, Intel Corporation
+           2006, Sean Estabrooks
+           2009, Chris Johnsen
+           (c) 2018, Intel Corporation
+           (c) 2015-2017 Intel Corporation.
+License:   GPL-2
+
+Files:
+ test/btt-check.sh
+ test/btt-errors.sh
+ test/btt-pad-compat.sh
+ test/clear.sh
+ test/core.c
+ test/create.sh
+ test/dax-errors.c
+ test/dax-pmd.c
+ test/dax.sh
+ test/daxdev-errors.c
+ test/daxdev-errors.sh
+ test/device-dax-fio.sh
+ test/device-dax.c
+ test/inject-error.sh
+ test/firmware-update.sh
+ test/label-compat.sh
+ test/mmap.sh
+ test/multi-dax.sh
+ test/pmem-errors.sh
+ test/sector-mode.sh
+ test/smart-listen.c
+ test/smart-notify.c
+ test/ack-shutdown-count-set.c
+ test/rescan-partitions.sh
+Copyright: (c) 2015-2017 Intel Corporation.
+ (c) 2018 Intel Corporation.
+License: GPL-2
+
+Files:
+ test/dax-dev.c
+ test/dsm-fail.c
+ test/libndctl.c
+ test/pmem_namespaces.c
+Copyright: 2014-2016, Intel Corporation.
+  2015, Intel Corporation.
+License: LGPL-2.1
+
+Files: test/mmap.c
+Copyright: (c) 2015 Toshi Kani, Hewlett Packard Enterprise.
+License: GPL-2
+
+License:   GPL-2
+ On Debian systems, the full text of the GNU General Public
+ License version 2 can be found in the file
+ `/usr/share/common-licenses/GPL-2'.
+
+License:   LGPL-2.1
+ On Debian systems, the full text of the GNU Lesser General Public
+ License version 2.1 can be found in the file
+ `/usr/share/common-licenses/LGPL-2.1'.
+
+License:   CC0-1.0
+ To the extent possible under law, the author(s) have dedicated all copyright
+ and related and neighboring rights to this software to the public domain
+ worldwide. This software is distributed without any warranty.
+ .
+ You should have received a copy of the CC0 Public Domain Dedication along with
+ this software. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
+ .
+ On Debian systems, the complete text of the CC0 1.0 Universal license can be
+ found in "/usr/share/common-licenses/CC0-1.0".
+
+License:   Expat
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.

debian/daxctl.install

@@ -0,0 +1,5 @@
+etc/daxctl.conf.d
+usr/bin/daxctl
+usr/share/bash-completion/completions/daxctl
+usr/share/daxctl/daxctl.conf
+debian/90-daxctl-device.rules lib/udev/rules.d

debian/libcxl-dev.install

@@ -0,0 +1,3 @@
+usr/include/cxl/*.h
+usr/lib/*/libcxl.so
+usr/lib/*/pkgconfig/libcxl.pc

debian/libcxl1.install

@@ -0,0 +1 @@
+usr/lib/*/libcxl*so.1*

debian/libdaxctl-dev.install

@@ -0,0 +1,3 @@
+usr/include/daxctl/libdaxctl.h
+usr/lib/*/libdaxctl.so
+usr/lib/*/pkgconfig/libdaxctl.pc

debian/libdaxctl1.install

@@ -0,0 +1 @@
+usr/lib/*/libdaxctl*so.1*

debian/libndctl-dev.install

@@ -0,0 +1,4 @@
+usr/include/ndctl/ndctl.h
+usr/include/ndctl/libndctl.h
+usr/lib/*/libndctl.so
+usr/lib/*/pkgconfig/libndctl.pc

debian/libndctl6.install

@@ -0,0 +1 @@
+usr/lib/*/libndctl*so.6*