Skip to content

Commit 258467a

Browse files
committed
chore: minor changes
Signed-off-by: ale5000 <15793015+ale5000-git@users.noreply.github.com>
1 parent 47f0a10 commit 258467a

6 files changed

Lines changed: 33 additions & 25 deletions

File tree

REUSE.toml

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ path = [
66
"fastlane/metadata/android/en-US/*.txt",
77
"gradle/wrapper/gradle-wrapper.properties",
88
".all-contributorsrc",
9-
"allowed_signers",
10-
"Gemfile.lock"
9+
"Gemfile.lock",
10+
"allowed_signers"
1111
]
1212
SPDX-FileCopyrightText = "NONE"
1313
SPDX-License-Identifier = "CC0-1.0"
@@ -22,3 +22,13 @@ SPDX-FileComment = [
2222
"https://code.visualstudio.com/docs/editor/tasks",
2323
"https://code.visualstudio.com/docs/editor/variables-reference"
2424
]
25+
26+
[[annotations]]
27+
path = [
28+
"gradle/wrapper/gradle-wrapper.jar"
29+
]
30+
SPDX-FileCopyrightText = "2007 the original author or authors"
31+
SPDX-License-Identifier = "Apache-2.0"
32+
SPDX-FileComment = [
33+
"Sources: https://github.com/gradle/gradle/tree/master/subprojects/wrapper"
34+
]

build.sh

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -257,8 +257,11 @@ cp -f "${MAIN_DIR:?}"/CHANGELOG.rst "${TEMP_DIR:?}/zip-content/docs/" || ui_erro
257257
# Do not ship currently unused files
258258
rm -rf "${TEMP_DIR:?}"/zip-content/misc/aapt || ui_error 'Failed to delete unused files in the temp dir'
259259
rm -f "${TEMP_DIR:?}"/zip-content/misc/busybox/busybox-mips* || ui_error 'Failed to delete unused files in the temp dir'
260-
rm -f "${TEMP_DIR:?}"/zip-content/LICENSES/Info-ZIP.txt || ui_error 'Failed to delete unused files in the temp dir'
261-
rm -f "${TEMP_DIR:?}"/zip-content/LICENSES/Unlicense.txt || ui_error 'Failed to delete unused files in the temp dir'
260+
261+
# Do not ship licenses of components used only by the repo and not by the produced zip
262+
rm -f "${TEMP_DIR:?}"/zip-content/LICENSES/LGPL-3.0-or-later.txt || ui_error 'Failed to delete unused licenses in the temp dir'
263+
rm -f "${TEMP_DIR:?}"/zip-content/LICENSES/Info-ZIP.txt || ui_error 'Failed to delete unused licenses in the temp dir'
264+
rm -f "${TEMP_DIR:?}"/zip-content/LICENSES/Unlicense.txt || ui_error 'Failed to delete unused licenses in the temp dir'
262265

263266
# Verify bundled application files to ensure package integrity; downloaded files have already been validated
264267
if test -e "${TEMP_DIR:?}/zip-content/origin/file-list.dat"; then

gradle/wrapper/gradle-wrapper.jar.license

Lines changed: 0 additions & 5 deletions
This file was deleted.

zip-content/REUSE.toml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@ version = 1
22

33
[[annotations]]
44
path = [
5-
"META-INF/com/google/android/updater-script*",
65
"META-INF/CERT.RSA",
76
"META-INF/CERT.SF",
8-
"META-INF/MANIFEST.MF"
7+
"META-INF/MANIFEST.MF",
8+
"META-INF/com/google/android/updater-script*",
9+
"origin/file-list.dat"
910
]
1011
SPDX-FileCopyrightText = "NONE"
1112
SPDX-License-Identifier = "CC0-1.0"
@@ -17,4 +18,6 @@ path = [
1718
]
1819
SPDX-FileCopyrightText = "NONE"
1920
SPDX-License-Identifier = "CC0-1.0"
20-
SPDX-FileComment = "This file contains a comprehensive list of all the options configurable via adb shell setprop"
21+
SPDX-FileComment = [
22+
"This file contains a comprehensive list of all the options configurable via: adb shell setprop"
23+
]

zip-content/misc/REUSE.toml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,24 @@ version = 1
22

33
[[annotations]]
44
path = [
5-
"busybox/busybox-*.bin"
5+
"aapt/aapt-*.bin"
66
]
7-
SPDX-FileCopyrightText = "BusyBox authors <https://github.com/yashdsaraf/busybox/raw/master/AUTHORS>"
8-
SPDX-License-Identifier = "GPL-2.0-only"
7+
SPDX-FileCopyrightText = "2005 The Android Open Source Project"
8+
SPDX-License-Identifier = "Apache-2.0"
99
SPDX-FileType = "APPLICATION"
1010
SPDX-FileComment = [
11-
"Sources: https://github.com/yashdsaraf/busybox",
12-
"Binaries: https://github.com/yashdsaraf/bb-bot/releases"
11+
"Sources: https://android.googlesource.com/platform/frameworks/base/+/refs/heads/master/tools/aapt/",
12+
"Binaries: https://github.com/substratum/substratum/tree/83f0847194c5d0adad714fbccd5573323c21be5b/app/src/main/assets"
1313
]
1414

1515
[[annotations]]
1616
path = [
17-
"aapt/aapt-*.bin"
17+
"busybox/busybox-*.bin"
1818
]
19-
SPDX-FileCopyrightText = "2005 The Android Open Source Project"
20-
SPDX-License-Identifier = "Apache-2.0"
19+
SPDX-FileCopyrightText = "BusyBox authors <https://github.com/yashdsaraf/busybox/raw/master/AUTHORS>"
20+
SPDX-License-Identifier = "GPL-2.0-only"
2121
SPDX-FileType = "APPLICATION"
2222
SPDX-FileComment = [
23-
"Sources: https://android.googlesource.com/platform/frameworks/base/+/refs/heads/master/tools/aapt/",
24-
"Binaries: https://github.com/substratum/substratum/tree/83f0847194c5d0adad714fbccd5573323c21be5b/app/src/main/assets"
23+
"Sources: https://github.com/yashdsaraf/busybox",
24+
"Binaries: https://github.com/yashdsaraf/bb-bot/releases"
2525
]

zip-content/origin/file-list.dat.license

Lines changed: 0 additions & 3 deletions
This file was deleted.

0 commit comments

Comments
 (0)