COPYING,common/*s390x*: distribute under Apache 2 license for s390x

The Ceph project cannot distributed GPL code as it is incompatible with the
LGPL that all Ceph code is licensed under. Since s390x is dual-licensed, we
choose to use the Apache 2 license.

Fixes: https://tracker.ceph.com/issues/68084
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>

diff --git a/COPYING b/COPYING
index 2f284fe9b6946a200ff56dc4aeb36fcacf3bd328..6d3b760e85af1000b4dd9f41a89526d864030319 100644 (file)
--- a/COPYING
+++ b/COPYING
@@ -227,5 +227,4 @@ License: GNU Affero General Public License, Version 3
 
 Files: src/common/*s390x*
 Copyright: 2024 IBM <contact@ibm.com>
-License: GNU General Public License, version 2
-         Apache License, version 2.0
+License: Apache License, version 2.0

diff --git a/src/common/crc32c_s390x.c b/src/common/crc32c_s390x.c
index 52709ac812483882a3618f78f94c564c064e23bf..6966f41c85e85d5bf30dca8ae3ffd847366c4090 100644 (file)
--- a/src/common/crc32c_s390x.c
+++ b/src/common/crc32c_s390x.c
@@ -1,14 +1,29 @@
 /*
- * CRC-32 algorithm implemented with the z/Architecture
- * Vector Extension Facility.
+ * CRC-32 algorithm implemented with the z/Architecture Vector Extension
+ * Facility.
+ *
+ * Copyright 2024 IBM Corporation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License.  You may obtain a copy
+ * of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
  *
- * Copyright IBM Corp. 2024
  * Author(s): Hendrik Brueckner <brueckner@linux.vnet.ibm.com>
  *            Anton Blanchard <anton@au.ibm.com>
  *            Bryan Chan <bryan.chan@ca.ibm.com>
  *            Chris Zou <chriszou@ca.ibm.com>
  *            Aliaksei Makarau <aliaksei.makarau@ibm.com>
  */
+
 #include <sys/types.h>
 #include <endian.h>
 #include "crc32c_s390x.h"

diff --git a/src/common/crc32c_s390x.h b/src/common/crc32c_s390x.h
index 996167c30732f30b12ba046b75dfb116d0b9fabb..ac71804c09794cc1c03b827a8c130ca4486690c2 100644 (file)
--- a/src/common/crc32c_s390x.h
+++ b/src/common/crc32c_s390x.h
@@ -1,3 +1,22 @@
+/*
+ * CRC-32 algorithm implemented with the z/Architecture Vector Extension
+ * Facility.
+ *
+ * Copyright 2024 IBM Corporation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License.  You may obtain a copy
+ * of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
 #ifndef CEPH_COMMON_CRC32C_S390X_H
 #define CEPH_COMMON_CRC32C_S390X_H
 

diff --git a/src/common/crc32c_s390x_le-vx.S b/src/common/crc32c_s390x_le-vx.S
index 8d09c785071b5fb70f068360ba74c53f324a7b9a..a413f759fef230f7b4255d18bd103f384b2d7c0a 100644 (file)
--- a/src/common/crc32c_s390x_le-vx.S
+++ b/src/common/crc32c_s390x_le-vx.S
@@ -1,14 +1,26 @@
 /*
  * Hardware-accelerated CRC-32 variants for Linux on z Systems
  *
- * Use the z/Architecture Vector Extension Facility to accelerate the
- * computing of bit-reflected CRC-32 checksums for IEEE 802.3 Ethernet
- * and Castagnoli.
+ * Use the z/Architecture Vector Extension Facility to accelerate the computing
+ * of bit-reflected CRC-32 checksums for IEEE 802.3 Ethernet and Castagnoli.
  *
- * This CRC-32 implementation algorithm is bit-reflected and processes
- * the least-significant bit first (Little-Endian).
+ * This CRC-32 implementation algorithm is bit-reflected and processes the
+ * least-significant bit first (Little-Endian).
+ *
+ * Copyright 2015 IBM Corporation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License.  You may obtain a copy
+ * of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
  *
- * Copyright IBM Corp. 2015
  * Author(s): Hendrik Brueckner <brueckner@linux.vnet.ibm.com>
  */
 

diff --git a/src/common/crc32c_s390x_vx-insn.h b/src/common/crc32c_s390x_vx-insn.h
index b6f7b23b5776456f71a3053b39f4ce6af29894c0..d3b7a9c800cd28741dc20cb5a00b53168b73f72a 100644 (file)
--- a/src/common/crc32c_s390x_vx-insn.h
+++ b/src/common/crc32c_s390x_vx-insn.h
@@ -1,10 +1,23 @@
 /*
  * Support for Vector Instructions
  *
- * Assembler macros to generate .byte/.word code for particular
- * vector instructions that are supported by recent binutils.
+ * Assembler macros to generate .byte/.word code for particular vector
+ * instructions that are supported by recent binutils.
+ *
+ * Copyright 2015 IBM Corporation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License.  You may obtain a copy
+ * of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
  *
- * Copyright IBM Corp. 2015
  * Author(s): Hendrik Brueckner <brueckner@linux.vnet.ibm.com>
  */