From 1c07d4ba1a25b0a1d180f3d0459c7a6aba451934 Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Fri, 25 Apr 2014 11:19:40 -0700 Subject: [PATCH] Remove All Rights Reserved The phrase is no longer needed as of August 23, 2000 with Nicaragua's joining of the Berne Convention. Additionally, in at least one instance, elements/cache-url/bin/cache-url, its existence in the file between Copyright lines is just weird and feels misleading, even though it is not. Remove all of the lines, because sanity. Change-Id: I24fd76c2b4f66b8036010b5079db39ead729abee --- bin/disk-image-create | 1 - bin/disk-image-get-kernel | 1 - bin/element-info | 1 - diskimage_builder/__init__.py | 1 - diskimage_builder/element_dependencies.py | 1 - diskimage_builder/tests/test_elementdeps.py | 1 - diskimage_builder/tests/test_elements.py | 1 - docs/ci.md | 2 -- elements/baremetal/cleanup.d/99-extract-kernel-and-ramdisk | 1 - elements/base/extra-data.d/99-enable-install-types | 1 - elements/cache-url/bin/cache-url | 1 - elements/debian/root.d/08-debootstrap | 1 - elements/dib-run-parts/bin/dib-run-parts | 1 - elements/dpkg/bin/install-packages | 1 - elements/dpkg/extra-data.d/01-copy-apt-keys | 1 - elements/dpkg/post-install.d/99-write-dpkg-manifest | 1 - elements/dpkg/pre-install.d/02-add-apt-keys | 1 - elements/manifests/cleanup.d/01-copy-manifests-dir | 1 - elements/manifests/environment.d/15-manifests | 1 - elements/manifests/extra-data.d/20-manifest-dir | 1 - elements/opensuse/bin/install-packages | 1 - elements/opensuse/bin/map-packages | 1 - elements/opensuse/bin/map-services | 1 - elements/ramdisk/extra-data.d/scripts/d/init-func | 2 -- elements/ramdisk/extra-data.d/scripts/init | 1 - elements/redhat-common/bin/map-packages | 1 - elements/redhat-common/bin/map-services | 1 - elements/yum/bin/install-packages | 1 - 28 files changed, 30 deletions(-) diff --git a/bin/disk-image-create b/bin/disk-image-create index 666788c1..1ae4cf11 100755 --- a/bin/disk-image-create +++ b/bin/disk-image-create @@ -1,7 +1,6 @@ #!/bin/bash # # Copyright 2012 Hewlett-Packard Development Company, L.P. -# All Rights Reserved. # # 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 diff --git a/bin/disk-image-get-kernel b/bin/disk-image-get-kernel index d32ef3e1..5eb487f7 100755 --- a/bin/disk-image-get-kernel +++ b/bin/disk-image-get-kernel @@ -1,7 +1,6 @@ #!/bin/bash # # Copyright 2012 Hewlett-Packard Development Company, L.P. -# All Rights Reserved. # # 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 diff --git a/bin/element-info b/bin/element-info index 99a1f110..58bd3cf0 100755 --- a/bin/element-info +++ b/bin/element-info @@ -1,6 +1,5 @@ #!/usr/bin/python # Copyright 2013 Hewlett-Packard Development Company, L.P. -# All Rights Reserved. # # 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 diff --git a/diskimage_builder/__init__.py b/diskimage_builder/__init__.py index 26d6cfb4..9d3b12aa 100644 --- a/diskimage_builder/__init__.py +++ b/diskimage_builder/__init__.py @@ -1,5 +1,4 @@ # Copyright 2012 Hewlett-Packard Development Company, L.P. -# All Rights Reserved. # # 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 diff --git a/diskimage_builder/element_dependencies.py b/diskimage_builder/element_dependencies.py index e404a92f..45472ef6 100644 --- a/diskimage_builder/element_dependencies.py +++ b/diskimage_builder/element_dependencies.py @@ -1,5 +1,4 @@ # Copyright 2013 Hewlett-Packard Development Company, L.P. -# All Rights Reserved. # # 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 diff --git a/diskimage_builder/tests/test_elementdeps.py b/diskimage_builder/tests/test_elementdeps.py index 4700474e..cf0f29c0 100644 --- a/diskimage_builder/tests/test_elementdeps.py +++ b/diskimage_builder/tests/test_elementdeps.py @@ -1,5 +1,4 @@ # Copyright 2013 Hewlett-Packard Development Company, L.P. -# All Rights Reserved. # # 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 diff --git a/diskimage_builder/tests/test_elements.py b/diskimage_builder/tests/test_elements.py index b24fd99d..4e0925e1 100644 --- a/diskimage_builder/tests/test_elements.py +++ b/diskimage_builder/tests/test_elements.py @@ -1,5 +1,4 @@ # Copyright 2012 Hewlett-Packard Development Company, L.P. -# All Rights Reserved. # # 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 diff --git a/docs/ci.md b/docs/ci.md index 127a41ca..13505b9f 100644 --- a/docs/ci.md +++ b/docs/ci.md @@ -28,8 +28,6 @@ Copyright Copyright 2012, 2013 Hewlett-Packard Development Company, L.P. Copyright (c) 2012 NTT DOCOMO, INC. -All Rights Reserved. - 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 diff --git a/elements/baremetal/cleanup.d/99-extract-kernel-and-ramdisk b/elements/baremetal/cleanup.d/99-extract-kernel-and-ramdisk index a0fc97d6..2622ae7f 100755 --- a/elements/baremetal/cleanup.d/99-extract-kernel-and-ramdisk +++ b/elements/baremetal/cleanup.d/99-extract-kernel-and-ramdisk @@ -1,7 +1,6 @@ #!/bin/bash # # Copyright 2014 Hewlett-Packard Development Company, L.P. -# All Rights Reserved. # # 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 diff --git a/elements/base/extra-data.d/99-enable-install-types b/elements/base/extra-data.d/99-enable-install-types index ee5e6665..2b5c262a 100755 --- a/elements/base/extra-data.d/99-enable-install-types +++ b/elements/base/extra-data.d/99-enable-install-types @@ -1,6 +1,5 @@ #!/bin/bash # Copyright 2014 Red Hat, Inc. -# All Rights Reserved. # # 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 diff --git a/elements/cache-url/bin/cache-url b/elements/cache-url/bin/cache-url index 132c2704..b98c11ba 100755 --- a/elements/cache-url/bin/cache-url +++ b/elements/cache-url/bin/cache-url @@ -1,7 +1,6 @@ #!/bin/bash # Copyright 2012 Hewlett-Packard Development Company, L.P. -# All Rights Reserved. # Copyright 2013 Red Hat, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/elements/debian/root.d/08-debootstrap b/elements/debian/root.d/08-debootstrap index 975bf1d0..b33f188d 100755 --- a/elements/debian/root.d/08-debootstrap +++ b/elements/debian/root.d/08-debootstrap @@ -1,7 +1,6 @@ #!/bin/sh # # Copyright 2014 Hewlett-Packard Development Company, L.P. -# All Rights Reserved. # # 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 diff --git a/elements/dib-run-parts/bin/dib-run-parts b/elements/dib-run-parts/bin/dib-run-parts index af5fde93..c2028a7d 100755 --- a/elements/dib-run-parts/bin/dib-run-parts +++ b/elements/dib-run-parts/bin/dib-run-parts @@ -2,7 +2,6 @@ # Inspired by Debian and RedHat run-parts but portable and specific to di-b. # # Copyright 2012 Hewlett-Packard Development Company, L.P. -# All Rights Reserved. # # 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 diff --git a/elements/dpkg/bin/install-packages b/elements/dpkg/bin/install-packages index fb62429b..dc755abc 100755 --- a/elements/dpkg/bin/install-packages +++ b/elements/dpkg/bin/install-packages @@ -1,7 +1,6 @@ #!/bin/bash # Copyright 2012 Hewlett-Packard Development Company, L.P. -# All Rights Reserved. # # 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 diff --git a/elements/dpkg/extra-data.d/01-copy-apt-keys b/elements/dpkg/extra-data.d/01-copy-apt-keys index 27607e00..89f1c13c 100755 --- a/elements/dpkg/extra-data.d/01-copy-apt-keys +++ b/elements/dpkg/extra-data.d/01-copy-apt-keys @@ -1,7 +1,6 @@ #!/bin/bash # # Copyright 2014 Hewlett-Packard Development Company, L.P. -# All Rights Reserved. # # 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 diff --git a/elements/dpkg/post-install.d/99-write-dpkg-manifest b/elements/dpkg/post-install.d/99-write-dpkg-manifest index 044240a8..22473a75 100755 --- a/elements/dpkg/post-install.d/99-write-dpkg-manifest +++ b/elements/dpkg/post-install.d/99-write-dpkg-manifest @@ -1,7 +1,6 @@ #!/bin/bash # # Copyright 2014 Hewlett-Packard Development Company, L.P. -# All Rights Reserved. # # 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 diff --git a/elements/dpkg/pre-install.d/02-add-apt-keys b/elements/dpkg/pre-install.d/02-add-apt-keys index 59210558..df931355 100755 --- a/elements/dpkg/pre-install.d/02-add-apt-keys +++ b/elements/dpkg/pre-install.d/02-add-apt-keys @@ -1,7 +1,6 @@ #!/bin/bash # # Copyright 2014 Hewlett-Packard Development Company, L.P. -# All Rights Reserved. # # 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 diff --git a/elements/manifests/cleanup.d/01-copy-manifests-dir b/elements/manifests/cleanup.d/01-copy-manifests-dir index 50d99957..fbf246d0 100755 --- a/elements/manifests/cleanup.d/01-copy-manifests-dir +++ b/elements/manifests/cleanup.d/01-copy-manifests-dir @@ -1,7 +1,6 @@ #!/bin/bash # # Copyright 2014 Hewlett-Packard Development Company, L.P. -# All Rights Reserved. # # 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 diff --git a/elements/manifests/environment.d/15-manifests b/elements/manifests/environment.d/15-manifests index 0a151d72..063cd6ca 100755 --- a/elements/manifests/environment.d/15-manifests +++ b/elements/manifests/environment.d/15-manifests @@ -1,7 +1,6 @@ #!/bin/bash # # Copyright 2014 Hewlett-Packard Development Company, L.P. -# All Rights Reserved. # # 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 diff --git a/elements/manifests/extra-data.d/20-manifest-dir b/elements/manifests/extra-data.d/20-manifest-dir index 48e605bb..efdcb90a 100755 --- a/elements/manifests/extra-data.d/20-manifest-dir +++ b/elements/manifests/extra-data.d/20-manifest-dir @@ -1,7 +1,6 @@ #!/bin/bash # # Copyright 2014 Hewlett-Packard Development Company, L.P. -# All Rights Reserved. # # 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 diff --git a/elements/opensuse/bin/install-packages b/elements/opensuse/bin/install-packages index eac97b4e..eceb864f 100755 --- a/elements/opensuse/bin/install-packages +++ b/elements/opensuse/bin/install-packages @@ -1,7 +1,6 @@ #!/bin/sh # Copyright 2013 SUSE Linux Products GmbH -# All Rights Reserved. # # 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 diff --git a/elements/opensuse/bin/map-packages b/elements/opensuse/bin/map-packages index ed6ae273..dc898946 100755 --- a/elements/opensuse/bin/map-packages +++ b/elements/opensuse/bin/map-packages @@ -1,7 +1,6 @@ #!/usr/bin/env python # Copyright 2013 SUSE Linux Products GmbH -# All Rights Reserved. # # 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 diff --git a/elements/opensuse/bin/map-services b/elements/opensuse/bin/map-services index 289b78ae..874c261a 100755 --- a/elements/opensuse/bin/map-services +++ b/elements/opensuse/bin/map-services @@ -2,7 +2,6 @@ # Copyright 2012 Hewlett-Packard Development Company, L.P. # Copyright 2014 SUSE, Inc. -# All Rights Reserved. # # 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 diff --git a/elements/ramdisk/extra-data.d/scripts/d/init-func b/elements/ramdisk/extra-data.d/scripts/d/init-func index cdde49d4..b3bb417e 100755 --- a/elements/ramdisk/extra-data.d/scripts/d/init-func +++ b/elements/ramdisk/extra-data.d/scripts/d/init-func @@ -1,8 +1,6 @@ # Copyright (c) 2012 NTT DOCOMO, INC. # Copyright 2012 Hewlett-Packard Development Company, L.P. # -# All Rights Reserved. -# # 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 diff --git a/elements/ramdisk/extra-data.d/scripts/init b/elements/ramdisk/extra-data.d/scripts/init index a947e27d..dae86c89 100755 --- a/elements/ramdisk/extra-data.d/scripts/init +++ b/elements/ramdisk/extra-data.d/scripts/init @@ -3,7 +3,6 @@ # Copyright (c) 2012 NTT DOCOMO, INC. # Copyright 2012 Hewlett-Packard Development Company, L.P. # -# All Rights Reserved. # # 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 diff --git a/elements/redhat-common/bin/map-packages b/elements/redhat-common/bin/map-packages index 69bd0869..151752f0 100755 --- a/elements/redhat-common/bin/map-packages +++ b/elements/redhat-common/bin/map-packages @@ -1,7 +1,6 @@ #!/usr/bin/env python # Copyright 2012 Hewlett-Packard Development Company, L.P. -# All Rights Reserved. # # 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 diff --git a/elements/redhat-common/bin/map-services b/elements/redhat-common/bin/map-services index 1b12fa25..1f5d4df7 100755 --- a/elements/redhat-common/bin/map-services +++ b/elements/redhat-common/bin/map-services @@ -2,7 +2,6 @@ # Copyright 2012 Hewlett-Packard Development Company, L.P. # Copyright 2014 Red Hat, Inc. -# All Rights Reserved. # # 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 diff --git a/elements/yum/bin/install-packages b/elements/yum/bin/install-packages index 956cc235..fe839827 100755 --- a/elements/yum/bin/install-packages +++ b/elements/yum/bin/install-packages @@ -1,7 +1,6 @@ #!/bin/bash # Copyright 2012 Hewlett-Packard Development Company, L.P. -# All Rights Reserved. # # 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