jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-28 13:16:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2249 from MilhouseVH/le82_fix_noobs

Browse Source 
NOOBS: shorten partition labels, change tar filename [backport]
This commit is contained in:
Christian Hewitt 2018-03-10 18:19:44 +04:00 committed by GitHub
commit 59c60c679c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/noobs/partitions.json
View File

@ -1,7 +1,7 @@
{ {
"partitions": [ "partitions": [
{ {
"label": "@DISTRONAME@_@PROJECT@_System", "label": "System",
"filesystem_type": "FAT", "filesystem_type": "FAT",
"partition_size_nominal": @SYSTEM_SIZE@, "partition_size_nominal": @SYSTEM_SIZE@,
"want_maximised": false, "want_maximised": false,
@ -9,7 +9,7 @@
"mkfs_options": "" "mkfs_options": ""
}, },
{ {
"label": "@DISTRONAME@_@PROJECT@_Storage", "label": "Storage",
"filesystem_type": "ext4", "filesystem_type": "ext4",
"partition_size_nominal": 512, "partition_size_nominal": 512,
"want_maximised": true, "want_maximised": true,

10
scripts/image
View File

@ -424,6 +424,8 @@ if [ "$1" = "release" -o "$1" = "mkimage" -o "$1" = "amlpkg" -o "$1" = "noobs" ]
popd > /dev/null popd > /dev/null
elif [ "$1" = "noobs" ]; then elif [ "$1" = "noobs" ]; then
echo "Creating \"$1\" release tarball..."
RELEASE_DIR="$TARGET_IMG/${IMAGE_NAME}-$1" RELEASE_DIR="$TARGET_IMG/${IMAGE_NAME}-$1"
# create release dir # create release dir
@ -507,12 +509,12 @@ if [ "$1" = "release" -o "$1" = "mkimage" -o "$1" = "amlpkg" -o "$1" = "noobs" ]
mkdir -p $RELEASE_DIR/${DISTRONAME}_${PROJECT}/Storage mkdir -p $RELEASE_DIR/${DISTRONAME}_${PROJECT}/Storage
# remove an previous created release tarball # remove an previous created release tarball
rm -rf $RELEASE_DIR/${DISTRONAME}_${PROJECT}/${DISTRONAME}_${PROJECT}_System.tar.xz rm -rf $RELEASE_DIR/${DISTRONAME}_${PROJECT}/System.tar.xz
rm -rf $RELEASE_DIR/${DISTRONAME}_${PROJECT}/${DISTRONAME}_${PROJECT}_Storage.tar.xz rm -rf $RELEASE_DIR/${DISTRONAME}_${PROJECT}/Storage.tar.xz
# create filesystem tarballs # create filesystem tarballs
tar cJf $RELEASE_DIR/${DISTRONAME}_${PROJECT}/${DISTRONAME}_${PROJECT}_System.tar.xz -C $RELEASE_DIR/${DISTRONAME}_${PROJECT}/System/ . tar cJf $RELEASE_DIR/${DISTRONAME}_${PROJECT}/System.tar.xz -C $RELEASE_DIR/${DISTRONAME}_${PROJECT}/System/ .
tar cJf $RELEASE_DIR/${DISTRONAME}_${PROJECT}/${DISTRONAME}_${PROJECT}_Storage.tar.xz -C $RELEASE_DIR/${DISTRONAME}_${PROJECT}/Storage/ . tar cJf $RELEASE_DIR/${DISTRONAME}_${PROJECT}/Storage.tar.xz -C $RELEASE_DIR/${DISTRONAME}_${PROJECT}/Storage/ .
# remove an filesystem dirs # remove an filesystem dirs
rm -rf $RELEASE_DIR/${DISTRONAME}_${PROJECT}/System rm -rf $RELEASE_DIR/${DISTRONAME}_${PROJECT}/System