Skip to content

Commit 36c0be5

Browse files
committed
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 <hswong3i@pantarei-design.com>
1 parent 04815e5 commit 36c0be5

21 files changed

+670
-3
lines changed

cxl/json.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#include <json-c/json.h>
1010
#include <json-c/printbuf.h>
1111
#include <ccan/short_types/short_types.h>
12-
#include <tracefs/tracefs.h>
12+
#include <tracefs.h>
1313

1414
#include "filter.h"
1515
#include "json.h"

cxl/lib/libcxl.sym

-1
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,6 @@ global:
208208
cxl_mapping_get_first;
209209
cxl_mapping_get_next;
210210
cxl_mapping_get_decoder;
211-
cxl_mapping_get_region;
212211
cxl_mapping_get_position;
213212
cxl_decoder_get_by_name;
214213
cxl_decoder_get_memdev;

cxl/libcxl.h

-1
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,6 @@ struct cxl_memdev_mapping *cxl_mapping_get_first(struct cxl_region *region);
354354
struct cxl_memdev_mapping *
355355
cxl_mapping_get_next(struct cxl_memdev_mapping *mapping);
356356
struct cxl_decoder *cxl_mapping_get_decoder(struct cxl_memdev_mapping *mapping);
357-
struct cxl_region *cxl_mapping_get_region(struct cxl_memdev_mapping *mapping);
358357
unsigned int cxl_mapping_get_position(struct cxl_memdev_mapping *mapping);
359358

360359
#define cxl_mapping_foreach(region, mapping) \

debian/.gitignore

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
*.substvars
2+
*debhelper*
3+
.debhelper
4+
files
5+
tmp
6+
daxctl
7+
libcxl-dev
8+
libcxl1
9+
libdaxctl-dev
10+
libdaxctl1
11+
libndctl-dev
12+
libndctl6
13+
ndctl

debian/90-daxctl-device.rules

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

debian/changelog

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
ndctl (100:80-1) UNRELEASED; urgency=medium
2+
3+
* https://github.com/pmem/ndctl/releases/tag/v80
4+
5+
-- Wong Hoi Sing Edison <hswong3i@pantarei-design.com> Fri, 11 Oct 2024 14:08:08 +0800

debian/control

+114
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,114 @@
1+
Source: ndctl
2+
Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
3+
XSBC-Original-Maintainer: Adam Borowski <kilobyte@angband.pl>
4+
Section: libs
5+
Priority: optional
6+
Standards-Version: 4.5.0
7+
Build-Depends: debhelper-compat (= 10),
8+
debhelper,
9+
pkg-config,
10+
libkmod-dev,
11+
libudev-dev,
12+
uuid-dev,
13+
libjson-c-dev,
14+
bash-completion,
15+
libkeyutils-dev,
16+
libiniparser-dev,
17+
meson,
18+
cmake,
19+
Rules-Requires-Root: no
20+
Homepage: https://github.com/pmem/ndctl/tags
21+
Vcs-Git: https://github.com/kilobyte/ndctl -b debian
22+
Vcs-Browser: https://github.com/kilobyte/ndctl/tree/debian
23+
24+
Package: ndctl
25+
Section: misc
26+
Architecture: linux-any
27+
Multi-Arch: foreign
28+
Depends: ${shlibs:Depends}, ${misc:Depends}
29+
Pre-Depends: ${misc:Pre-Depends}
30+
# RPM-world's name for cxl tools
31+
Provides: cxl-cli
32+
Description: Utility for managing the nvdimm subsystem
33+
The nvdimm subsystem defines a kernel device model and control message
34+
interface for platform NVDIMM resources like those defined by the ACPI 6+ NFIT
35+
(NVDIMM Firmware Interface Table).
36+
.
37+
This package contains a utility for managing the nvdimm (non-volatile memory
38+
device) subsystem in the Linux kernel.
39+
40+
Package: libndctl6
41+
Architecture: linux-any
42+
Multi-Arch: same
43+
Depends: ${shlibs:Depends}, ${misc:Depends}
44+
Description: Utility library for managing the libnvdimm subsystem
45+
The nvdimm subsystem defines a kernel device model and control message
46+
interface for platform NVDIMM resources like those defined by the ACPI 6+ NFIT
47+
(NVDIMM Firmware Interface Table).
48+
.
49+
This package contains a utility library for managing the libnvdimm
50+
(non-volatile memory device) sub-system in the Linux kernel.
51+
52+
Package: libndctl-dev
53+
Section: libdevel
54+
Architecture: linux-any
55+
Multi-Arch: same
56+
Depends: libndctl6 (= ${binary:Version}), ${misc:Depends}
57+
Description: Development files for libndctl
58+
Header files and development library for compiling C programs to link
59+
with the libndctl library and manage the libnvdimm sub-system in the
60+
Linux kernel.
61+
62+
Package: daxctl
63+
Section: misc
64+
Architecture: linux-any
65+
Multi-Arch: foreign
66+
Depends: ${shlibs:Depends}, ${misc:Depends}
67+
Description: Utility for managing the device DAX subsystem
68+
"DAX" are file system extensions to bypass the page cache and block layer to
69+
mmap persistent memory, from a PMEM block device, directly into a process
70+
address space.
71+
.
72+
This package contains a utility for managing the device DAX subsystem in the
73+
Linux kernel.
74+
75+
Package: libdaxctl1
76+
Architecture: linux-any
77+
Multi-Arch: same
78+
Depends: ${shlibs:Depends}, ${misc:Depends}
79+
Description: Utility library for managing the device DAX subsystem
80+
"DAX" are file system extensions to bypass the page cache and block layer to
81+
mmap persistent memory, from a PMEM block device, directly into a process
82+
address space.
83+
.
84+
This package contains a utility library used by applications to manage the
85+
device DAX subsystem in the Linux kernel.
86+
87+
Package: libdaxctl-dev
88+
Section: libdevel
89+
Architecture: linux-any
90+
Multi-Arch: same
91+
Depends: libdaxctl1 (= ${binary:Version}), ${misc:Depends}
92+
Description: Development files for libdaxctl
93+
Header files and development library for compiling C programs to link
94+
with the libdaxctl library and manage the device DAX subsystem in the
95+
Linux kernel.
96+
97+
Package: libcxl1
98+
Architecture: linux-any
99+
Multi-Arch: same
100+
Depends: ${shlibs:Depends}, ${misc:Depends}
101+
Description: utility library for managing Compute Express Link devices
102+
CXL (Compute Express Link) is a family of PCIe-based protocols that can be
103+
used to connect high-speed I/O and memory devices. This library includes
104+
code to enumerate/query/configure such devices.
105+
106+
Package: libcxl-dev
107+
Section: libdevel
108+
Architecture: linux-any
109+
Multi-Arch: same
110+
Depends: libcxl1 (= ${binary:Version}), ${misc:Depends}
111+
Description: Development files for libcxl
112+
Header files and development library for compiling C programs to link
113+
with the libcxl library and manage the Compute Express Link subsystem in
114+
the Linux kernel.

debian/copyright

+199
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,199 @@
1+
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
2+
Upstream-Name: ndctl
3+
Source: https://github.com/pmem/ndctl
4+
Copyright: 2013-2018 Intel Corporation
5+
License: LGPL-2.1
6+
7+
Files: *
8+
Copyright: 2014-2018 Intel Corporation
9+
License: LGPL-2.1
10+
11+
Files: test.h
12+
daxctl/list.c
13+
Copyright: (c) 2015-2017 Intel Corporation
14+
(c) 2013-2016 Intel Corporation
15+
License: GPL-2
16+
17+
Files: ccan/*
18+
Copyright: Unknown
19+
License: CC0-1.0
20+
21+
Files: ccan/list/*
22+
Copyright: Unknown
23+
License: Expat
24+
25+
Files: daxctl/daxctl.c
26+
Copyright: (c) 2005 Andreas Ericsson.
27+
(c) 2015-2017 Intel Corporation. All rights reserved
28+
License: GPL-2
29+
30+
Files: daxctl/libdaxctl.h
31+
daxctl/lib/libdaxctl-private.h
32+
daxctl/lib/libdaxctl.c
33+
Copyright: (c) 2016, Intel Corporation.
34+
(c) 2014-2016, Intel Corporation.
35+
License: LGPL-2.1
36+
37+
Files: ndctl/dimm.c
38+
ndctl/lib/ars.c
39+
ndctl/lib/dimm.c
40+
ndctl/lib/hpe1.c
41+
ndctl/lib/hpe1.h
42+
ndctl/lib/inject.c
43+
ndctl/lib/intel.c
44+
ndctl/lib/intel.h
45+
ndctl/lib/libndctl.c
46+
ndctl/lib/msft.c
47+
ndctl/lib/msft.h
48+
ndctl/lib/nfit.c
49+
ndctl/lib/private.h
50+
ndctl/lib/smart.c
51+
ndctl/libndctl-nfit.h
52+
ndctl/libndctl.h
53+
ndctl/namespace.h
54+
ndctl/ndctl.h
55+
Copyright: 2014-2015, Intel Corporation.
56+
2014-2016, Intel Corporation.
57+
2014-2017, Intel Corporation.
58+
2016, Hewlett Packard Enterprise Development LP
59+
2016, Intel Corporation.
60+
2016-2017, Dell, Inc.
61+
2016-2017, Intel Corporation.
62+
2017, FUJITSU LIMITED.
63+
2017, Hewlett Packard Enterprise Development LP
64+
2017, Intel Corporation.
65+
License: LGPL-2.1
66+
67+
Files: ndctl/inject-error.c
68+
ndctl/list.c
69+
ndctl/namespace.c
70+
ndctl/region.c
71+
ndctl/test.c
72+
ndctl/inject-smart.c
73+
ndctl/lib/firmware.c
74+
ndctl/bat.c
75+
ndctl/create-nfit.c
76+
ndctl/check.c
77+
ndctl/action.h
78+
ndctl/bus.c
79+
Copyright: (c) 2015-2017 Intel Corporation.
80+
(c) 2015-2016 Intel Corporation.
81+
(c) 2018 Intel Corporation.
82+
(c) 2014 Intel Corporation.
83+
License: GPL-2
84+
85+
Files: ndctl/ndctl.c
86+
Copyright: (c) 2005 Andreas Ericsson.
87+
(c) 2015-2017 Intel Corporation.
88+
License: GPL-2
89+
90+
Files: util/*
91+
Copyright: (c) 2015-2017 Intel Corporation.
92+
(c) 2005 Junio C Hamano.
93+
(c) 2005 Linus Torvalds.
94+
(c) 2006 Linus Torvalds.
95+
(c) 2007 Pierre Habouzit.
96+
(c) 2008 Miklos Vajna.
97+
(c) 2009 Akinobu Mita.
98+
License: GPL-2
99+
100+
Files: util/log.c
101+
util/log.h
102+
util/sysfs.c
103+
util/sysfs.h
104+
Copyright: 2014-2016, Intel Corporation.
105+
2016, Intel Corporation.
106+
License: LGPL-2.1
107+
108+
Files: Documentation/*
109+
Copyright: 2005, Jonas Fonseca
110+
2005, Sergey Vlasov
111+
(c) 2017, Intel Corporation
112+
(c) 2016 - 2017, Intel Corporation
113+
2006, Sean Estabrooks
114+
2009, Chris Johnsen
115+
(c) 2018, Intel Corporation
116+
(c) 2015-2017 Intel Corporation.
117+
License: GPL-2
118+
119+
Files:
120+
test/btt-check.sh
121+
test/btt-errors.sh
122+
test/btt-pad-compat.sh
123+
test/clear.sh
124+
test/core.c
125+
test/create.sh
126+
test/dax-errors.c
127+
test/dax-pmd.c
128+
test/dax.sh
129+
test/daxdev-errors.c
130+
test/daxdev-errors.sh
131+
test/device-dax-fio.sh
132+
test/device-dax.c
133+
test/inject-error.sh
134+
test/firmware-update.sh
135+
test/label-compat.sh
136+
test/mmap.sh
137+
test/multi-dax.sh
138+
test/pmem-errors.sh
139+
test/sector-mode.sh
140+
test/smart-listen.c
141+
test/smart-notify.c
142+
test/ack-shutdown-count-set.c
143+
test/rescan-partitions.sh
144+
Copyright: (c) 2015-2017 Intel Corporation.
145+
(c) 2018 Intel Corporation.
146+
License: GPL-2
147+
148+
Files:
149+
test/dax-dev.c
150+
test/dsm-fail.c
151+
test/libndctl.c
152+
test/pmem_namespaces.c
153+
Copyright: 2014-2016, Intel Corporation.
154+
2015, Intel Corporation.
155+
License: LGPL-2.1
156+
157+
Files: test/mmap.c
158+
Copyright: (c) 2015 Toshi Kani, Hewlett Packard Enterprise.
159+
License: GPL-2
160+
161+
License: GPL-2
162+
On Debian systems, the full text of the GNU General Public
163+
License version 2 can be found in the file
164+
`/usr/share/common-licenses/GPL-2'.
165+
166+
License: LGPL-2.1
167+
On Debian systems, the full text of the GNU Lesser General Public
168+
License version 2.1 can be found in the file
169+
`/usr/share/common-licenses/LGPL-2.1'.
170+
171+
License: CC0-1.0
172+
To the extent possible under law, the author(s) have dedicated all copyright
173+
and related and neighboring rights to this software to the public domain
174+
worldwide. This software is distributed without any warranty.
175+
.
176+
You should have received a copy of the CC0 Public Domain Dedication along with
177+
this software. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
178+
.
179+
On Debian systems, the complete text of the CC0 1.0 Universal license can be
180+
found in "/usr/share/common-licenses/CC0-1.0".
181+
182+
License: Expat
183+
Permission is hereby granted, free of charge, to any person obtaining a copy
184+
of this software and associated documentation files (the "Software"), to deal
185+
in the Software without restriction, including without limitation the rights
186+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
187+
copies of the Software, and to permit persons to whom the Software is
188+
furnished to do so, subject to the following conditions:
189+
.
190+
The above copyright notice and this permission notice shall be included in
191+
all copies or substantial portions of the Software.
192+
.
193+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
194+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
195+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
196+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
197+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
198+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
199+
THE SOFTWARE.

debian/daxctl.install

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
etc/daxctl.conf.d
2+
usr/bin/daxctl
3+
usr/share/bash-completion/completions/daxctl
4+
usr/share/daxctl/daxctl.conf
5+
debian/90-daxctl-device.rules lib/udev/rules.d

debian/libcxl-dev.install

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
usr/include/cxl/*.h
2+
usr/lib/*/libcxl.so
3+
usr/lib/*/pkgconfig/libcxl.pc

debian/libcxl1.install

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
usr/lib/*/libcxl*so.1*

debian/libdaxctl-dev.install

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
usr/include/daxctl/libdaxctl.h
2+
usr/lib/*/libdaxctl.so
3+
usr/lib/*/pkgconfig/libdaxctl.pc

debian/libdaxctl1.install

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
usr/lib/*/libdaxctl*so.1*

debian/libndctl-dev.install

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
usr/include/ndctl/ndctl.h
2+
usr/include/ndctl/libndctl.h
3+
usr/lib/*/libndctl.so
4+
usr/lib/*/pkgconfig/libndctl.pc

debian/libndctl6.install

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
usr/lib/*/libndctl*so.6*

0 commit comments

Comments
 (0)