Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge up the stable-2.1 changes #6093

Merged
merged 10 commits into from
May 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 0 additions & 27 deletions .github/workflows/pmem.io_doc_update.yml

This file was deleted.

4 changes: 2 additions & 2 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
XXX
Thu May 23 2024 Oksana Sałyk <[email protected]>

* Version 2.1.0

Expand All @@ -15,7 +15,7 @@ XXX
- The debug logging subsystem becomes DEPRECATED.
- Introduces fuses against ill-considered use of NDCTL_ENABLE=n.
- PMEMOBJ_IGNORE_DIRTY_SHUTDOWN and PMEMOBJ_IGNORE_BAD_BLOCKS are required to acknowledge the understanding of what production-critical functions are missing for the build without NDCTL.
- Does not allow opening PMEMOBJ pool without unsafe shutdown counter (USC) if not explicitly disabled. (#5968)
- Does not allow create PMEMOBJ pool without unsafe shutdown counter (USC) if not explicitly disabled. (#5968)
- use PMEMOBJ_CONF="sds.at_create=0" to disable USC when working without PMem (emulated PMem, Docker, etc.).
- Drops support for building without libpthread (NO_LIBPTHREAD build-time define).

Expand Down
4 changes: 2 additions & 2 deletions INSTALL.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ cd pmdk
For a stable version, checkout a [release tag](https://github.com/pmem/pmdk/releases) as follows. Otherwise skip this step to build the latest development release.

```sh
git checkout tags/2.0.1
git checkout tags/2.1.0
```

Once all required [dependencies](#dependencies) are installed, PMDK is built using the
Expand Down Expand Up @@ -128,7 +128,7 @@ To enable logging of debug information, use debug version of a library and set
desired log level using (library-specific) variable, e.g. `PMEM_LOG_LEVEL=<level>`.

For more details see appropriate manpage (debbuging section), e.g.
[libpmem(7)](https://pmem.io/pmdk/manpages/linux/master/libpmem/libpmem.7/#debugging-and-error-handling).
[libpmem(7)](https://github.com/pmem/pmdk/blob/master/doc/libpmem/libpmem.7.md#error-handling-1).

## Experimental Packages

Expand Down
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
[![Coverage](https://codecov.io/github/pmem/pmdk/coverage.svg?branch=master)](https://codecov.io/gh/pmem/pmdk/branch/master)
[![PMem test](https://github.com/pmem/pmdk/actions/workflows/pmem_tests.yml/badge.svg?branch=master)](https://github.com/pmem/pmdk/actions/workflows/pmem_tests.yml)
[![Pmem RAS](https://github.com/pmem/pmdk/actions/workflows/pmem_ras.yml/badge.svg?branch=master)](https://github.com/pmem/pmdk/actions/workflows/pmem_ras.yml)
[![pmem.io](https://github.com/pmem/pmdk/actions/workflows/pmem.io_doc_update.yml/badge.svg?branch=master)](https://github.com/pmem/pmdk/actions/workflows/pmem.io_doc_update.yml)
[![Docker rebuild](https://github.com/pmem/pmdk/actions/workflows/docker_rebuild.yml/badge.svg?branch=master)](https://github.com/pmem/pmdk/actions/workflows/docker_rebuild.yml)

The **Persistent Memory Development Kit (PMDK)** is a collection of libraries and tools for System Administrators and Application Developers to simplify managing and accessing persistent memory devices. For more information, see https://pmem.io.
Expand Down
3 changes: 0 additions & 3 deletions RELEASE_STEPS.md
Original file line number Diff line number Diff line change
Expand Up @@ -108,15 +108,12 @@ git commit --reset-author
## 6. Announcement (only major/minor releases)

Announce the release on the:
- [pmem.io](https://pmem.io/announcements/)
- [Slack](https://pmem-io.slack.com)
- [Google group](https://groups.google.com/g/pmem )

## 7. Later, for major/minor release

- on the stable-$VER branch, bump the version of Docker images (`utils/docker/images/set-images-version.sh`) to $VER
- once the pmem.github.io repository contains new documentation (thanks to `utils/docker/run-doc-update.sh` script run in CI),
add a new tag ("$VER") in file `data/releases_linux.yml` based on previous tags in this file.

## 8. For curious readers

Expand Down
4 changes: 2 additions & 2 deletions doc/libpmem/.gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
libpmem.7
pmem_flush.3
pmem_is_pmem.3
pmem_log_get_treshold.3
pmem_log_get_threshold.3
pmem_log_set_function.3
pmem_log_set_treshold.3
pmem_log_set_threshold.3
pmem_memmove_persist.3
2 changes: 1 addition & 1 deletion utils/build-dpkg.sh
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ Section: libs
Priority: optional
Standards-version: 4.1.4
Build-Depends: debhelper (>= 9)
Homepage: https://pmem.io/pmdk/
Homepage: https://github.com/pmem/pmdk

Package: libpmem
Architecture: any
Expand Down
4 changes: 2 additions & 2 deletions utils/docker/images/set-images-version.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
#
# SPDX-License-Identifier: BSD-3-Clause
# Copyright 2020-2023, Intel Corporation
# Copyright 2020-2024, Intel Corporation
#

#
Expand All @@ -13,4 +13,4 @@
# has to trigger the rebuild of all Docker images.
#

export IMG_VER=2.0
export IMG_VER=2.1
2 changes: 1 addition & 1 deletion utils/libpmem.pc.in
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ includedir=${prefix}/include
Name: libpmem
Description: libpmem library from PMDK project
Version: ${version}
URL: https://pmem.io/pmdk
URL: https://github.com/pmem/pmdk
Requires:
Libs: -L${libdir} -lpmem
Cflags: -I${includedir}
2 changes: 1 addition & 1 deletion utils/libpmem2.pc.in
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ includedir=${prefix}/include
Name: libpmem2
Description: libpmem2 library from PMDK project
Version: ${version}
URL: https://pmem.io/pmdk
URL: https://github.com/pmem/pmdk
Requires:
Libs: -L${libdir} -lpmem2
Cflags: -I${includedir}
2 changes: 1 addition & 1 deletion utils/libpmemobj.pc.in
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ includedir=${prefix}/include
Name: libpmemobj
Description: libpmemobj library from PMDK project
Version: ${version}
URL: https://pmem.io/pmdk
URL: https://github.com/pmem/pmdk
Requires.private: libpmem${rasdeps}
Libs: -L${libdir} -lpmemobj
Libs.private: -ldl
Expand Down
2 changes: 1 addition & 1 deletion utils/libpmempool.pc.in
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ includedir=${prefix}/include
Name: libpmempool
Description: libpmempool library from PMDK project
Version: ${version}
URL: https://pmem.io/pmdk
URL: https://github.com/pmem/pmdk
Requires.private: libpmem${rasdeps}
Libs: -L${libdir} -lpmempool
Libs.private: -ldl
Expand Down
4 changes: 2 additions & 2 deletions utils/pkg-config.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright 2014-2020, Intel Corporation
# Copyright 2014-2024, Intel Corporation

# Name of package
PACKAGE_NAME="pmdk"
Expand All @@ -14,4 +14,4 @@ PACKAGE_SUMMARY="Persistent Memory Development Kit"
PACKAGE_DESCRIPTION="The collection of libraries and utilities for Persistent Memory Programming"

# Website
PACKAGE_URL="https://pmem.io/pmdk"
PACKAGE_URL="https://github.com/pmem/pmdk"
2 changes: 1 addition & 1 deletion utils/pmdk.spec.in
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Summary: __PACKAGE_SUMMARY__
Packager: __PACKAGE_MAINTAINER__
Group: __GROUP_SYS_LIBS__
License: __LICENSE__
URL: https://pmem.io/pmdk
URL: https://github.com/pmem/pmdk

Source0: %{name}-%{version}.tar.gz

Expand Down
97 changes: 0 additions & 97 deletions utils/run-doc-update.sh

This file was deleted.

Loading