Re: [Replicant] [PATCH] fix #1853 "Ecryption" typo in Settings App
On 09/02/2018 08:15 PM, Joonas Kylmälä wrote: > Hi, > > I can test it and push after the upstream merges. All the (non-merge) > commits to this point have contained the Signed-off-by line but it seems > like Replicant project has not formally established a meaning for it? I > have taken it's meaning as that one certifies it is originally created > by the patch sender and is compatible with the license. So just not to > break the pattern (yeah silly :D) and as a note that you have created > the patch could you add it? Done! Please, find it attached. > > Joonas > > Fil: >> Hi, >> >> I finally found 5 minutes to correct the infamous typo mentioned in >> issue #1853[1] >> Thanks to Kurtis for doing the biggest job of researching the exact >> string inside the tree. >> Please find the related patch attached to this email. >> >> Can anybody push it and confirm? >> >> Thanks, >> >> Happy hacking, >> >> Fil >> >> [1] https://redmine.replicant.us/issues/1853 >> >> >> >> ___ >> Replicant mailing list >> Replicant@osuosl.org >> https://lists.osuosl.org/mailman/listinfo/replicant >> From e17c05cfe9665ff1ec9dffbf46f90be18e44fa3d Mon Sep 17 00:00:00 2001 From: Fil Bergamo Date: Sun, 2 Sep 2018 16:44:44 + Subject: [PATCH] fix #1853 "Ecryption" typo in Settings App Signed-off-by: Fil Bergamo --- res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index 6a8993266..f0c3449e1 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -832,7 +832,7 @@ media, and other files. After you encrypt your phone, assuming you\u2019ve set up a screen lock (that is, a pattern or numeric PIN or password), you\u2019ll need to unlock the screen to decrypt the phone every time you power it on. The only other way to decrypt is to perform a factory -data reset, erasing all your data.\n\nEcryption can fail sometimes, so please create a backup of +data reset, erasing all your data.\n\nEncryption can fail sometimes, so please create a backup of your data before you proceed!\n\nEncryption takes an hour or more. You must start with a charged battery and keep your phone plugged in throughout the process. If you interrupt it, you\u2019ll lose some or all of your data. -- 2.11.0 signature.asc Description: OpenPGP digital signature ___ Replicant mailing list Replicant@osuosl.org https://lists.osuosl.org/mailman/listinfo/replicant
Re: [Replicant] Changes for 6.0 0004 release
Hi,
I can start pushing the merged repositories that didn't require any
additional commits to make it work. Is that fine?
I would also still like some feedback on the patches I sent earlier and
won't be pushing them before someone comments on them.
There has been one patch more created for
https://git.replicant.us/replicant/manifest (branch replicant-6.0-dev)
since last time:
0001-Replace-tuna-and-espresso10-kernels-with-omap4-kerne.patch
This has to do with LineageOS merging espressowifi, espresso3g and
maguro devices' kernel together. You can find this new kernel at
git://git.putti.eu/replicant/kernel_ti_omap4.git – I have brought all
the Replicant patches from the previous kernels and decided to go with
the old defconfigs because I do not have those devices to test with.
Speaking of testing, Asara from IRC has created nightly builds for us at
https://jenkins.minhas.io/nightly_builds/replicant/6.0-dev/ from the
manifest at git://git.putti.eu/replicant/manifest.git (branch
replicant-6.0-dev). For me the builds have worked very nicely on i9300,
i9305 and N7100. Maguro and espresso{wifi,3g} device testers are very
welcome to reported their luck with the builds!
Joonas
Joonas Kylmälä:
> Hi,
>
> I have made bunch of little modifications to merge latest updates and
> security fixes from upstream sources for the next Replicant 6.0 0004
> release. Please review them:
>
> For https://git.replicant.us/replicant/manifest (branch LineageOS-mirror):
> 0001-Adapt-to-recent-LineageOS-forks-LineageOS-mirror.patch
>
> For https://git.replicant.us/replicant/manifest (branch replicant-6.0-dev):
> 0001-Adapt-to-recent-LineageOS-forks-replicant-6.0-dev.patch
> 0002-Update-F-Droid-Privileged-Extension-to-0.2.8-replicant-6.0-dev.patch
>
> For https://git.replicant.us/replicant/frameworks_base (branch
> replicant-6.0):
> 0001-Revert-Point-ResXMLTree-to-a-copy-of-the-asset-buffe.patch
>
> This last one will be replaced during the upstream merge with
> https://github.com/LineageOS/android_frameworks_base/commit/4541eceec70adaa58823ad58ed370b5a19777a95
>
> You can download a version that includes all the aforementioned patches
> and upstream merges with "repo init -u
> ssh://g...@git.putti.eu/replicant/manifest.git -b replicant-6.0-dev" but
> you need to email me your public ssh key for access (I don't have https
> and git protocol is not secure, though you can use it – it's available).
>
> Joonas
>
From 6648556611e6f1d42208d26c3134e978b26b662d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joonas=20Kylm=C3=A4l=C3=A4?=
Date: Thu, 30 Aug 2018 17:13:00 -0400
Subject: [PATCH] Replace tuna and espresso10 kernels with omap4 kernel
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
These two kernels were combined together.
Signed-off-by: Joonas Kylmälä
---
default.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/default.xml b/default.xml
index 2ceda12..d0aae9d 100644
--- a/default.xml
+++ b/default.xml
@@ -516,8 +516,8 @@
-
-
+
+>
--
2.11.0
signature.asc
Description: OpenPGP digital signature
___
Replicant mailing list
Replicant@osuosl.org
https://lists.osuosl.org/mailman/listinfo/replicant
Re: [Replicant] [PATCH] fix #1853 "Ecryption" typo in Settings App
Hi, I can test it and push after the upstream merges. All the (non-merge) commits to this point have contained the Signed-off-by line but it seems like Replicant project has not formally established a meaning for it? I have taken it's meaning as that one certifies it is originally created by the patch sender and is compatible with the license. So just not to break the pattern (yeah silly :D) and as a note that you have created the patch could you add it? Joonas Fil: > Hi, > > I finally found 5 minutes to correct the infamous typo mentioned in > issue #1853[1] > Thanks to Kurtis for doing the biggest job of researching the exact > string inside the tree. > Please find the related patch attached to this email. > > Can anybody push it and confirm? > > Thanks, > > Happy hacking, > > Fil > > [1] https://redmine.replicant.us/issues/1853 > > > > ___ > Replicant mailing list > Replicant@osuosl.org > https://lists.osuosl.org/mailman/listinfo/replicant > signature.asc Description: OpenPGP digital signature ___ Replicant mailing list Replicant@osuosl.org https://lists.osuosl.org/mailman/listinfo/replicant
[Replicant] [PATCH] fix #1853 "Ecryption" typo in Settings App
Hi, I finally found 5 minutes to correct the infamous typo mentioned in issue #1853[1] Thanks to Kurtis for doing the biggest job of researching the exact string inside the tree. Please find the related patch attached to this email. Can anybody push it and confirm? Thanks, Happy hacking, Fil [1] https://redmine.replicant.us/issues/1853 From e17c05cfe9665ff1ec9dffbf46f90be18e44fa3d Mon Sep 17 00:00:00 2001 From: Fil Bergamo Date: Sun, 2 Sep 2018 16:44:44 + Subject: [PATCH] fix #1853 "Ecryption" typo in Settings App --- res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index 6a8993266..f0c3449e1 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -832,7 +832,7 @@ media, and other files. After you encrypt your phone, assuming you\u2019ve set up a screen lock (that is, a pattern or numeric PIN or password), you\u2019ll need to unlock the screen to decrypt the phone every time you power it on. The only other way to decrypt is to perform a factory -data reset, erasing all your data.\n\nEcryption can fail sometimes, so please create a backup of +data reset, erasing all your data.\n\nEncryption can fail sometimes, so please create a backup of your data before you proceed!\n\nEncryption takes an hour or more. You must start with a charged battery and keep your phone plugged in throughout the process. If you interrupt it, you\u2019ll lose some or all of your data. -- 2.11.0 signature.asc Description: OpenPGP digital signature ___ Replicant mailing list Replicant@osuosl.org https://lists.osuosl.org/mailman/listinfo/replicant
