Hi,

I tried to draft patches for the RepWifi ticket over here:
https://redmine.replicant.us/issues/1887. Please see them as
attachments. What do you think will happen when we update the RepWifi
app next time in Replicant and the user has already upgraded it with
F-Droid? Also will this just start piling up
fil.libre.repwifiapp_{9,10,11,12,13...}.apk files during each Replicant
upgrade until storage is full?

Joonas
From 4a1386ebb40994a958233028055c22b14a266207 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joonas=20Kylm=C3=A4l=C3=A4?= <[email protected]>
Date: Tue, 28 Aug 2018 14:18:51 -0400
Subject: [PATCH] Integrate RepWifi as prebuilt and presigned app
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Using this F-Droid signed version of RepWifi allows one to update
RepWifi with F-Droid instead of only during Replicant upgrades.

Signed-off-by: Joonas Kylmälä <[email protected]>
---
 get-prebuilts              | 5 +++++
 prebuilt/common/Android.mk | 8 ++++++++
 2 files changed, 13 insertions(+)

diff --git a/get-prebuilts b/get-prebuilts
index 0e4398d7..b1a4a0ea 100755
--- a/get-prebuilts
+++ b/get-prebuilts
@@ -9,3 +9,8 @@ mkdir -p $BASEDIR/prebuilt/common/apps/
 curl -L -o $BASEDIR/prebuilt/common/apps/FDroid.apk -O -L https://f-droid.org/FDroid.apk
 curl -L -o $BASEDIR/prebuilt/common/apps/FDroid.apk.asc -O -L https://f-droid.org/FDroid.apk.asc
 gpg --armor --verify $BASEDIR/prebuilt/common/apps/FDroid.apk.asc $BASEDIR/prebuilt/common/apps/FDroid.apk
+
+# RepWifi
+curl -L -o $BASEDIR/prebuilt/common/apps/fil.libre.repwifiapp_9.apk -O -L https://f-droid.org/repo/fil.libre.repwifiapp_9.apk
+curl -L -o $BASEDIR/prebuilt/common/apps/fil.libre.repwifiapp_9.apk.asc -O -L https://f-droid.org/repo/fil.libre.repwifiapp_9.apk.asc
+gpg --armor --verify $BASEDIR/prebuilt/common/apps/fil.libre.repwifiapp_9.apk.asc $BASEDIR/prebuilt/common/apps/fil.libre.repwifiapp_9.apk
diff --git a/prebuilt/common/Android.mk b/prebuilt/common/Android.mk
index 137030bd..262acf9b 100644
--- a/prebuilt/common/Android.mk
+++ b/prebuilt/common/Android.mk
@@ -16,3 +16,11 @@ LOCAL_CERTIFICATE := PRESIGNED
 LOCAL_SRC_FILES := apps/FDroid.apk
 
 include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := RepWifi
+LOCAL_MODULE_CLASS := APPS
+LOCAL_CERTIFICATE := PRESIGNED
+LOCAL_SRC_FILES := apps/fil.libre.repwifiapp_9.apk
+
+include $(BUILD_PREBUILT)
-- 
2.11.0

From bd4a339d46af4e71986b07bc402b4f1711c258d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joonas=20Kylm=C3=A4l=C3=A4?= <[email protected]>
Date: Tue, 28 Aug 2018 14:27:44 -0400
Subject: [PATCH] Remove RepWifi source code
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

We will use prebuilt version of RepWifi from F-Droid. The script
"vendor/replicant/get-prebuilts" will be used to get the prebuilt
version.

Signed-off-by: Joonas Kylmälä <[email protected]>
---
 default.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/default.xml b/default.xml
index 2ceda12..783c94e 100644
--- a/default.xml
+++ b/default.xml
@@ -209,7 +209,6 @@
   <project path="packages/apps/CellBroadcastReceiver" name="LineageOS-mirror/android_packages_apps_CellBroadcastReceiver.git" groups="pdk-fs" />
   <project path="packages/apps/CertInstaller" name="LineageOS-mirror/android_packages_apps_CertInstaller.git" groups="pdk-cw-fs,pdk-fs" />
   <project path="packages/apps/CMFileManager" name="LineageOS-mirror/android_packages_apps_CMFileManager.git" />
-  <project path="packages/apps/RepWifi" name="replicant/packages_apps_repwifi.git" remote="replicant" />
   <project path="packages/apps/ReplicantWallpapers" name="replicant/packages_apps_replicantwallpapers.git" remote="replicant" />
   <project path="packages/apps/Contacts" name="LineageOS-mirror/android_packages_apps_Contacts.git" groups="pdk-fs" />
   <project path="packages/apps/ContactsCommon" name="LineageOS-mirror/android_packages_apps_ContactsCommon.git" groups="pdk-fs" />
-- 
2.11.0

Attachment: signature.asc
Description: OpenPGP digital signature

_______________________________________________
Replicant mailing list
[email protected]
https://lists.osuosl.org/mailman/listinfo/replicant

Reply via email to