Re: [UNIKRAFT PATCH 4/8] Correct license headers introduced by UPB

[Razvan Deaconescu <razvan.deaconescu@xxxxxxxxx>]

This is OK from UPB's side.

Reviewed-by: Razvan Deaconescu <razvan.deaconescu@xxxxxxxxx>

Razvan

Simon Kuenzer <simon.kuenzer@xxxxxxxxx> writes:
> This commit removes the additional clause
> "THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY"
> from BSD license headers that got introduced by mistake
> by Cristian Banu with the following commits:
>  ca9616f9a - lib/uk9p: Add 9P fid abstraction
>  b2ce99adc - lib/uk9p: Add 9P transport registration
>  5c24de843 - lib/uk9p: Add 9P device implementation
>  440259b39 - plat/xen/drivers/9p: Initialize xenbus device
>  5282598ae - plat/drivers: Virtio 9P driver skeleton
>  7ee9a512d - plat/xen/drivers: Add 9pfront driver skeleton
>  f2c29a657 - lib/uk9p: Add 9P requests abstraction
>  f74733d49 - lib/9pfs: Implement mount and unmount
>  cd65e50e4 - lib/uk9p: Add 9P protocol core definitions
>  ef1021378 - lib/9pfs: Add 9pfs header
>  e77b99c78 - lib/uk9p: Add 9P helper API
>
> On the one hand, this additional clause is redundant because
> the BSD license already states that it must remain and the
> copyright notice must be kept.
> On the other hand, the clause freezes the file header
> and prohibits future contributors from extending the
> copyright notice for their contributions. This additional
> clause is not part of the official BSD 3-clause.
>
> The original author consents to the change with a `Signed-off-by`
> or `Reviewed-by` tag to this commit.
>
> Signed-off-by: Simon Kuenzer <simon.kuenzer@xxxxxxxxx>
> ---
>  lib/9pfs/9pfs.h                         | 2 --
>  lib/9pfs/9pfs_vfsops.c                  | 2 --
>  lib/9pfs/9pfs_vnops.c                   | 2 --
>  lib/uk9p/9p.c                           | 2 --
>  lib/uk9p/9pdev.c                        | 2 --
>  lib/uk9p/9pdev_trans.c                  | 2 --
>  lib/uk9p/9pfid.c                        | 2 --
>  lib/uk9p/9preq.c                        | 2 --
>  lib/uk9p/include/uk/9p.h                | 2 --
>  lib/uk9p/include/uk/9p_core.h           | 2 --
>  lib/uk9p/include/uk/9pdev.h             | 2 --
>  lib/uk9p/include/uk/9pdev_core.h        | 2 --
>  lib/uk9p/include/uk/9pdev_trans.h       | 2 --
>  lib/uk9p/include/uk/9pfid.h             | 2 --
>  lib/uk9p/include/uk/9preq.h             | 2 --
>  plat/drivers/include/virtio/virtio_9p.h | 2 --
>  plat/drivers/virtio/virtio_9p.c         | 2 --
>  plat/xen/drivers/9p/9pfront.c           | 2 --
>  plat/xen/drivers/9p/9pfront.h           | 2 --
>  plat/xen/drivers/9p/9pfront_xb.h        | 2 --
>  plat/xen/drivers/9p/9pfront_xs.c        | 2 --
>  21 files changed, 42 deletions(-)
>
> diff --git a/lib/9pfs/9pfs.h b/lib/9pfs/9pfs.h
> index 3571c857b..38eb00b8c 100644
> --- a/lib/9pfs/9pfs.h
> +++ b/lib/9pfs/9pfs.h
> @@ -28,8 +28,6 @@
>   * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
>   * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
>   * POSSIBILITY OF SUCH DAMAGE.
> - *
> - * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
>   */
>  
>  #ifndef __UK_9PFS__
> diff --git a/lib/9pfs/9pfs_vfsops.c b/lib/9pfs/9pfs_vfsops.c
> index 5293b2213..6550a5e99 100644
> --- a/lib/9pfs/9pfs_vfsops.c
> +++ b/lib/9pfs/9pfs_vfsops.c
> @@ -28,8 +28,6 @@
>   * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
>   * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
>   * POSSIBILITY OF SUCH DAMAGE.
> - *
> - * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
>   */
>  
>  #include <uk/config.h>
> diff --git a/lib/9pfs/9pfs_vnops.c b/lib/9pfs/9pfs_vnops.c
> index 5a0700c61..a0b11686c 100644
> --- a/lib/9pfs/9pfs_vnops.c
> +++ b/lib/9pfs/9pfs_vnops.c
> @@ -28,8 +28,6 @@
>   * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
>   * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
>   * POSSIBILITY OF SUCH DAMAGE.
> - *
> - * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
>   */
>  
>  #define _GNU_SOURCE
> diff --git a/lib/uk9p/9p.c b/lib/uk9p/9p.c
> index abddb6088..a6a7fb943 100644
> --- a/lib/uk9p/9p.c
> +++ b/lib/uk9p/9p.c
> @@ -28,8 +28,6 @@
>   * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
>   * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
>   * POSSIBILITY OF SUCH DAMAGE.
> - *
> - * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
>   */
>  
>  #include <uk/config.h>
> diff --git a/lib/uk9p/9pdev.c b/lib/uk9p/9pdev.c
> index bdd6a84cf..1cc6167f8 100644
> --- a/lib/uk9p/9pdev.c
> +++ b/lib/uk9p/9pdev.c
> @@ -28,8 +28,6 @@
>   * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
>   * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
>   * POSSIBILITY OF SUCH DAMAGE.
> - *
> - * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
>   */
>  
>  #include <stdbool.h>
> diff --git a/lib/uk9p/9pdev_trans.c b/lib/uk9p/9pdev_trans.c
> index 156632032..628f67d24 100644
> --- a/lib/uk9p/9pdev_trans.c
> +++ b/lib/uk9p/9pdev_trans.c
> @@ -28,8 +28,6 @@
>   * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
>   * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
>   * POSSIBILITY OF SUCH DAMAGE.
> - *
> - * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
>   */
>  
>  #include <errno.h>
> diff --git a/lib/uk9p/9pfid.c b/lib/uk9p/9pfid.c
> index 85d14c660..16e27b74f 100644
> --- a/lib/uk9p/9pfid.c
> +++ b/lib/uk9p/9pfid.c
> @@ -28,8 +28,6 @@
>   * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
>   * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
>   * POSSIBILITY OF SUCH DAMAGE.
> - *
> - * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
>   */
>  
>  #include <uk/config.h>
> diff --git a/lib/uk9p/9preq.c b/lib/uk9p/9preq.c
> index edc462cc0..b85798051 100644
> --- a/lib/uk9p/9preq.c
> +++ b/lib/uk9p/9preq.c
> @@ -28,8 +28,6 @@
>   * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
>   * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
>   * POSSIBILITY OF SUCH DAMAGE.
> - *
> - * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
>   */
>  
>  #include <string.h>
> diff --git a/lib/uk9p/include/uk/9p.h b/lib/uk9p/include/uk/9p.h
> index e91b14774..06befc755 100644
> --- a/lib/uk9p/include/uk/9p.h
> +++ b/lib/uk9p/include/uk/9p.h
> @@ -28,8 +28,6 @@
>   * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
>   * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
>   * POSSIBILITY OF SUCH DAMAGE.
> - *
> - * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
>   */
>  #ifndef __UK_9P__
>  #define __UK_9P__
> diff --git a/lib/uk9p/include/uk/9p_core.h b/lib/uk9p/include/uk/9p_core.h
> index 197f7a95d..59f5527ae 100644
> --- a/lib/uk9p/include/uk/9p_core.h
> +++ b/lib/uk9p/include/uk/9p_core.h
> @@ -28,8 +28,6 @@
>   * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
>   * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
>   * POSSIBILITY OF SUCH DAMAGE.
> - *
> - * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
>   */
>  
>  #ifndef __UK_9P_CORE__
> diff --git a/lib/uk9p/include/uk/9pdev.h b/lib/uk9p/include/uk/9pdev.h
> index 560ba8f79..75be3518f 100644
> --- a/lib/uk9p/include/uk/9pdev.h
> +++ b/lib/uk9p/include/uk/9pdev.h
> @@ -28,8 +28,6 @@
>   * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
>   * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
>   * POSSIBILITY OF SUCH DAMAGE.
> - *
> - * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
>   */
>  
>  #ifndef __UK_9PDEV__
> diff --git a/lib/uk9p/include/uk/9pdev_core.h 
> b/lib/uk9p/include/uk/9pdev_core.h
> index fcad1ef75..99c290b4c 100644
> --- a/lib/uk9p/include/uk/9pdev_core.h
> +++ b/lib/uk9p/include/uk/9pdev_core.h
> @@ -28,8 +28,6 @@
>   * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
>   * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
>   * POSSIBILITY OF SUCH DAMAGE.
> - *
> - * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
>   */
>  
>  #ifndef __UK_9PDEV_CORE__
> diff --git a/lib/uk9p/include/uk/9pdev_trans.h 
> b/lib/uk9p/include/uk/9pdev_trans.h
> index 6e981ae88..7a68ff027 100644
> --- a/lib/uk9p/include/uk/9pdev_trans.h
> +++ b/lib/uk9p/include/uk/9pdev_trans.h
> @@ -28,8 +28,6 @@
>   * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
>   * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
>   * POSSIBILITY OF SUCH DAMAGE.
> - *
> - * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
>   */
>  
>  #ifndef __UK_9PDEV_TRANS__
> diff --git a/lib/uk9p/include/uk/9pfid.h b/lib/uk9p/include/uk/9pfid.h
> index 7ec75bb4a..ad33efbaa 100644
> --- a/lib/uk9p/include/uk/9pfid.h
> +++ b/lib/uk9p/include/uk/9pfid.h
> @@ -28,8 +28,6 @@
>   * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
>   * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
>   * POSSIBILITY OF SUCH DAMAGE.
> - *
> - * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
>   */
>  
>  #ifndef __UK_9PFID__
> diff --git a/lib/uk9p/include/uk/9preq.h b/lib/uk9p/include/uk/9preq.h
> index aad8d4263..90febd865 100644
> --- a/lib/uk9p/include/uk/9preq.h
> +++ b/lib/uk9p/include/uk/9preq.h
> @@ -28,8 +28,6 @@
>   * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
>   * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
>   * POSSIBILITY OF SUCH DAMAGE.
> - *
> - * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
>   */
>  
>  #ifndef __UK_9PREQ__
> diff --git a/plat/drivers/include/virtio/virtio_9p.h 
> b/plat/drivers/include/virtio/virtio_9p.h
> index 29158ab71..383a60832 100644
> --- a/plat/drivers/include/virtio/virtio_9p.h
> +++ b/plat/drivers/include/virtio/virtio_9p.h
> @@ -28,8 +28,6 @@
>   * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
>   * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
>   * POSSIBILITY OF SUCH DAMAGE.
> - *
> - * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
>   */
>  
>  #ifndef __PLAT_DRV_VIRTIO_9P_H
> diff --git a/plat/drivers/virtio/virtio_9p.c b/plat/drivers/virtio/virtio_9p.c
> index a783eba27..1974efe88 100644
> --- a/plat/drivers/virtio/virtio_9p.c
> +++ b/plat/drivers/virtio/virtio_9p.c
> @@ -28,8 +28,6 @@
>   * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
>   * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
>   * POSSIBILITY OF SUCH DAMAGE.
> - *
> - * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
>   */
>  
>  #include <inttypes.h>
> diff --git a/plat/xen/drivers/9p/9pfront.c b/plat/xen/drivers/9p/9pfront.c
> index 429c7b97d..6c9f232c0 100644
> --- a/plat/xen/drivers/9p/9pfront.c
> +++ b/plat/xen/drivers/9p/9pfront.c
> @@ -28,8 +28,6 @@
>   * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
>   * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
>   * POSSIBILITY OF SUCH DAMAGE.
> - *
> - * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
>   */
>  
>  #include <stdbool.h>
> diff --git a/plat/xen/drivers/9p/9pfront.h b/plat/xen/drivers/9p/9pfront.h
> index 0bbc7f445..2fba9ad7d 100644
> --- a/plat/xen/drivers/9p/9pfront.h
> +++ b/plat/xen/drivers/9p/9pfront.h
> @@ -28,8 +28,6 @@
>   * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
>   * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
>   * POSSIBILITY OF SUCH DAMAGE.
> - *
> - * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
>   */
>  
>  #ifndef __9PFRONT_H__
> diff --git a/plat/xen/drivers/9p/9pfront_xb.h 
> b/plat/xen/drivers/9p/9pfront_xb.h
> index 6e2697f9c..bfa094fb8 100644
> --- a/plat/xen/drivers/9p/9pfront_xb.h
> +++ b/plat/xen/drivers/9p/9pfront_xb.h
> @@ -28,8 +28,6 @@
>   * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
>   * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
>   * POSSIBILITY OF SUCH DAMAGE.
> - *
> - * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
>   */
>  
>  #ifndef __9PFRONT_XB_H__
> diff --git a/plat/xen/drivers/9p/9pfront_xs.c 
> b/plat/xen/drivers/9p/9pfront_xs.c
> index 7185061cc..b78e67211 100644
> --- a/plat/xen/drivers/9p/9pfront_xs.c
> +++ b/plat/xen/drivers/9p/9pfront_xs.c
> @@ -28,8 +28,6 @@
>   * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
>   * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
>   * POSSIBILITY OF SUCH DAMAGE.
> - *
> - * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
>   */
>  
>  #include <string.h>