From d10751ac91da96be023b4e9f11ea1e5ee9ea2563 Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Mon, 10 Jan 2022 04:41:30 +0200 Subject: [PATCH] aosp-merger: Switch to SPDX copyright header * Less clutter Change-Id: Ib8496ec5d02521ce76a886fb0b48133d57a6f707 --- aosp-merger/aosp-merger.sh | 15 +++------------ aosp-merger/branches_rebase.sh | 15 +++------------ aosp-merger/branches_restore.sh | 14 ++------------ aosp-merger/branches_save.sh | 14 ++------------ aosp-merger/squash.sh | 14 ++------------ 5 files changed, 12 insertions(+), 60 deletions(-) diff --git a/aosp-merger/aosp-merger.sh b/aosp-merger/aosp-merger.sh index 87f2f8b..ebcf732 100755 --- a/aosp-merger/aosp-merger.sh +++ b/aosp-merger/aosp-merger.sh @@ -1,18 +1,9 @@ #!/bin/bash # -# Copyright (C) 2017 The LineageOS Project +# SPDX-FileCopyrightText: 2017, 2020-2021 The LineageOS Project +# SPDX-FileCopyrightText: 2021 The Calyx Institute # -# 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. +# SPDX-License-Identifier: Apache-2.0 # usage() { diff --git a/aosp-merger/branches_rebase.sh b/aosp-merger/branches_rebase.sh index 1c9ec12..dfb37ae 100755 --- a/aosp-merger/branches_rebase.sh +++ b/aosp-merger/branches_rebase.sh @@ -1,19 +1,10 @@ #!/bin/bash # -# Copyright (C) 2017 The LineageOS Project +# SPDX-FileCopyrightText: 2017 The LineageOS Project # -# 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. +# SPDX-License-Identifier: Apache-2.0 # + ##### # Rebase your local working branches onto a new "upstream" branch. # Local branch list is defined in branches.list diff --git a/aosp-merger/branches_restore.sh b/aosp-merger/branches_restore.sh index c10d626..73f1a85 100755 --- a/aosp-merger/branches_restore.sh +++ b/aosp-merger/branches_restore.sh @@ -1,18 +1,8 @@ #!/bin/bash # -# Copyright (C) 2017 The LineageOS Project +# SPDX-FileCopyrightText: 2017 The LineageOS Project # -# 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. +# SPDX-License-Identifier: Apache-2.0 # if [ ! -e "build/envsetup.sh" ]; then diff --git a/aosp-merger/branches_save.sh b/aosp-merger/branches_save.sh index a806430..510e414 100755 --- a/aosp-merger/branches_save.sh +++ b/aosp-merger/branches_save.sh @@ -1,18 +1,8 @@ #!/bin/bash # -# Copyright (C) 2017 The LineageOS Project +# SPDX-FileCopyrightText: 2017 The LineageOS Project # -# 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. +# SPDX-License-Identifier: Apache-2.0 # if [ ! -e "build/envsetup.sh" ]; then diff --git a/aosp-merger/squash.sh b/aosp-merger/squash.sh index 32bedde..9372525 100755 --- a/aosp-merger/squash.sh +++ b/aosp-merger/squash.sh @@ -1,19 +1,9 @@ #!/bin/bash # -# Copyright (C) 2017 The LineageOS Project +# Copyright (C) 2017, 2020-2021 The LineageOS Project # Copyright (C) 2021-2022 The Calyx Institute # -# 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. +# SPDX-License-Identifier: Apache-2.0 # usage() {