This accomodates the following changes since last release: - The images paths changed to something like replicant-6.0-0004-rc1.zip - There is now a wrapper to build images in vendor/replicant/build.sh - Wolfgang's key has been replaced by my key
This change doesn't take that into account but it should still be sufficent for adding the replicant-6.0-0004 tag to the various git repositories. Signed-off-by: Denis 'GNUtoo' Carikli <[email protected]> --- releasebuild.sh | 37 +++---------------------------------- releasevars.sh | 24 ++++++++++++------------ 2 files changed, 15 insertions(+), 46 deletions(-) diff --git a/releasebuild.sh b/releasebuild.sh index 27204d8..2228c5c 100755 --- a/releasebuild.sh +++ b/releasebuild.sh @@ -26,46 +26,16 @@ REPLICANT_DIR=$1 ARGS_COUNT=1 parallel_tasks=$(echo "$(grep 'processor' /proc/cpuinfo | wc -l ) + 1" | bc) -sign_build () { - device=$1 - - dir=$( pwd ) - cd "$REPLICANT_DIR" - - . build/envsetup.sh - lunch "replicant_$device-userdebug" - - ./vendor/replicant/sign-build $device - - cd "$dir" -} - -build_bacon () { - device=$1 - +build_all () { dir=$( pwd ) cd "$REPLICANT_DIR" - . build/envsetup.sh - lunch "replicant_$device-userdebug" - - make -j$parallel_tasks bacon - - cd "$dir" -} - -sign_all () { for device in $RELEASE_DEVICES do - sign_build $device + vendor/replicant/build.sh $device done -} -build_all () { - for device in $RELEASE_DEVICES - do - build_bacon $device - done + cd "$dir" } prepare () { @@ -91,4 +61,3 @@ fi prepare build_all -sign_all diff --git a/releasevars.sh b/releasevars.sh index 09950d7..2340f8e 100755 --- a/releasevars.sh +++ b/releasevars.sh @@ -17,7 +17,7 @@ # VERSION="6.0" -RELEASE="0003" +RELEASE="0004-rc1" # The files are in out/dist/${device}/ RELEASE_IMAGES="\ recovery-i9100.img \ @@ -30,16 +30,16 @@ RELEASE_IMAGES="\ recovery-i9305.img \ recovery-n5100.img \ recovery-n5110.img \ - replicant-6.0-i9100.zip \ - replicant-6.0-n7000.zip \ - replicant-6.0-maguro.zip \ - replicant-6.0-espressowifi.zip \ - replicant-6.0-espresso3g.zip \ - replicant-6.0-i9300.zip \ - replicant-6.0-n7100.zip \ - replicant-6.0-i9305.zip \ - replicant-6.0-n5100.zip \ - replicant-6.0-n5110.zip \ + replicant-${VERSION}-${RELEASE}-i9100.zip \ + replicant-${VERSION}-${RELEASE}-n7000.zip \ + replicant-${VERSION}-${RELEASE}-maguro.zip \ + replicant-${VERSION}-${RELEASE}-espressowifi.zip \ + replicant-${VERSION}-${RELEASE}-espresso3g.zip \ + replicant-${VERSION}-${RELEASE}-i9300.zip \ + replicant-${VERSION}-${RELEASE}-n7100.zip \ + replicant-${VERSION}-${RELEASE}-i9305.zip \ + replicant-${VERSION}-${RELEASE}-n5100.zip \ + replicant-${VERSION}-${RELEASE}-n5110.zip \ " RELEASE_DEVICES="\ @@ -55,7 +55,7 @@ RELEASE_DEVICES="\ n5110 \ " -RELEASE_KEY="5816A24C10757FC4" +RELEASE_KEY="FB31DBA3AB8DB76A4157329F7651568F80374459" REPO="repo" COLOR=1 -- 2.24.1 _______________________________________________ Replicant mailing list [email protected] https://lists.osuosl.org/mailman/listinfo/replicant
