metaovl: Fix incorrect permission, Add updateJson and changelog
This commit is contained in:
4
.github/workflows/meta-overlay.yml
vendored
4
.github/workflows/meta-overlay.yml
vendored
@@ -50,5 +50,7 @@ jobs:
|
|||||||
uses: actions/upload-artifact@v5
|
uses: actions/upload-artifact@v5
|
||||||
with:
|
with:
|
||||||
name: meta-overlayfs
|
name: meta-overlayfs
|
||||||
path: userspace/meta-overlayfs/target/meta-overlayfs-*.zip
|
path: |
|
||||||
|
userspace/meta-overlayfs/target/meta-overlayfs-*.zip
|
||||||
|
userspace/meta-overlayfs/metamodule/meta-overlayfs-changelog.md
|
||||||
if-no-files-found: error
|
if-no-files-found: error
|
||||||
|
|||||||
@@ -5,8 +5,18 @@ set -e
|
|||||||
VERSION=$(grep '^version' Cargo.toml | head -1 | sed 's/.*"\(.*\)".*/\1/')
|
VERSION=$(grep '^version' Cargo.toml | head -1 | sed 's/.*"\(.*\)".*/\1/')
|
||||||
OUTPUT_DIR="target"
|
OUTPUT_DIR="target"
|
||||||
METAMODULE_DIR="metamodule"
|
METAMODULE_DIR="metamodule"
|
||||||
|
MODULE_PROP_FILE="$METAMODULE_DIR/module.prop"
|
||||||
|
UPDATE_JSON_FILE="$METAMODULE_DIR/update.json"
|
||||||
MODULE_OUTPUT_DIR="$OUTPUT_DIR/module"
|
MODULE_OUTPUT_DIR="$OUTPUT_DIR/module"
|
||||||
|
|
||||||
|
MODULE_VERSION=$(grep -m1 '^version=' "$MODULE_PROP_FILE" | cut -d'=' -f2- | tr -d '\r')
|
||||||
|
MODULE_VERSION_CODE=$(grep -m1 '^versionCode=' "$MODULE_PROP_FILE" | cut -d'=' -f2- | tr -d '\r')
|
||||||
|
|
||||||
|
if [ -z "$MODULE_VERSION" ] || [ -z "$MODULE_VERSION_CODE" ]; then
|
||||||
|
echo "Error: Failed to read module version information from $MODULE_PROP_FILE"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
echo "=========================================="
|
echo "=========================================="
|
||||||
echo "Building meta-overlayfs v${VERSION}"
|
echo "Building meta-overlayfs v${VERSION}"
|
||||||
echo "=========================================="
|
echo "=========================================="
|
||||||
@@ -77,10 +87,30 @@ echo " x86_64: $(du -h "$MODULE_OUTPUT_DIR"/meta-overlayfs-x86_64 | awk '{prin
|
|||||||
echo ""
|
echo ""
|
||||||
echo "Packaging..."
|
echo "Packaging..."
|
||||||
cd "$MODULE_OUTPUT_DIR"
|
cd "$MODULE_OUTPUT_DIR"
|
||||||
ZIP_NAME="meta-overlayfs-v${VERSION}.zip"
|
ZIP_NAME="meta-overlayfs-v${MODULE_VERSION}.zip"
|
||||||
zip -r "../$ZIP_NAME" .
|
zip -r "../$ZIP_NAME" .
|
||||||
cd ../..
|
cd ../..
|
||||||
|
|
||||||
|
echo ""
|
||||||
|
echo "Generating update.json..."
|
||||||
|
if ! LATEST_TAG=$(git describe --tags --abbrev=0 2>/dev/null); then
|
||||||
|
echo "Error: Unable to determine the latest git tag."
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
ZIP_URL="https://github.com/tiann/KernelSU/releases/download/${LATEST_TAG}/${ZIP_NAME}"
|
||||||
|
CHANGELOG_URL="https://github.com/tiann/KernelSU/releases/download/${LATEST_TAG}/meta-overlayfs-changelog.md"
|
||||||
|
|
||||||
|
cat > "$UPDATE_JSON_FILE" <<EOF
|
||||||
|
{
|
||||||
|
"version": "${MODULE_VERSION}",
|
||||||
|
"versionCode": ${MODULE_VERSION_CODE},
|
||||||
|
"zipUrl": "${ZIP_URL}",
|
||||||
|
"changelog": "${CHANGELOG_URL}"
|
||||||
|
}
|
||||||
|
EOF
|
||||||
|
echo "Generated $UPDATE_JSON_FILE"
|
||||||
|
|
||||||
echo ""
|
echo ""
|
||||||
echo "=========================================="
|
echo "=========================================="
|
||||||
echo "Build completed successfully!"
|
echo "Build completed successfully!"
|
||||||
|
|||||||
@@ -0,0 +1,4 @@
|
|||||||
|
|
||||||
|
# v1.1.0 Changelog
|
||||||
|
|
||||||
|
Fix bootloop
|
||||||
@@ -67,10 +67,11 @@ copy_selinux_contexts() {
|
|||||||
post_install_to_image() {
|
post_install_to_image() {
|
||||||
ui_print "- Copying module content to image"
|
ui_print "- Copying module content to image"
|
||||||
|
|
||||||
set_perm_recursive "$MNT_DIR" 0 0 0755 0644
|
set_perm "$MNT_DIR" 0 0 0755 0644
|
||||||
|
|
||||||
MOD_IMG_DIR="$MNT_DIR/$MODID"
|
MOD_IMG_DIR="$MNT_DIR/$MODID"
|
||||||
mkdir -p "$MOD_IMG_DIR"
|
mkdir -p "$MOD_IMG_DIR"
|
||||||
|
set_perm "$MOD_IMG_DIR" 0 0 0755 0644
|
||||||
|
|
||||||
# Move all partition directories
|
# Move all partition directories
|
||||||
for partition in system vendor product system_ext odm oem; do
|
for partition in system vendor product system_ext odm oem; do
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
id=meta-overlayfs
|
id=meta-overlayfs
|
||||||
metamodule=1
|
metamodule=1
|
||||||
name=OverlayFS MetaModule
|
name=OverlayFS MetaModule
|
||||||
version=1.0.0
|
version=1.1.0
|
||||||
versionCode=1
|
versionCode=1100
|
||||||
author=KernelSU Developers
|
author=KernelSU Developers
|
||||||
description=An implementation of a metamodule using OverlayFS for KernelSU
|
description=An implementation of a metamodule using OverlayFS for KernelSU
|
||||||
updateJson=https://raw.githubusercontent.com/tiann/KernelSU/main/userspace/meta-overlayfs/update.json
|
updateJson=https://raw.githubusercontent.com/tiann/KernelSU/refs/heads/main/userspace/meta-overlayfs/metamodule/update.json
|
||||||
6
userspace/meta-overlayfs/metamodule/update.json
Normal file
6
userspace/meta-overlayfs/metamodule/update.json
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
{
|
||||||
|
"version": "1.1.0",
|
||||||
|
"versionCode": 1100,
|
||||||
|
"zipUrl": "https://github.com/tiann/KernelSU/releases/download/v2.1.2/meta-overlayfs-v1.1.0.zip",
|
||||||
|
"changelog": "https://github.com/tiann/KernelSU/releases/download/v2.1.2/meta-overlayfs-changelog.md"
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user