[LEDE-DEV] [RFC 01/13] procd: prepare NAND sysupgrade for making upgraded dynamically linked

[Philip Prindeville]

Inline…

> On Apr 24, 2017, at 2:20 PM, Matthias Schiffer <mschiffer at universe-factory.net> wrote:
> 
> On 04/24/2017 10:05 PM, Philip Prindeville wrote:
>> Inline…
>> 
>>> On Apr 23, 2017, at 6:06 PM, Matthias Schiffer <mschiffer at universe-factory.net> wrote:
>>> 
>>> Use install_bin to copy upgraded with all dependencies. The old name
>>> /tmp/upgraded is temporarily retained as a symlink to avoid breaking
>>> things.
>>> 
>>> Signed-off-by: Matthias Schiffer <mschiffer at universe-factory.net>
>>> ---
>>> package/system/procd/files/nand.sh | 9 +++++----
>>> 1 file changed, 5 insertions(+), 4 deletions(-)
>>> 
>>> diff --git a/package/system/procd/files/nand.sh b/package/system/procd/files/nand.sh
>>> index 01dba61644..9c831df3b4 100644
>>> --- a/package/system/procd/files/nand.sh
>>> +++ b/package/system/procd/files/nand.sh
>>> @@ -194,7 +194,7 @@ nand_upgrade_prepare_ubi() {
>>> 
>>> nand_do_upgrade_success() {
>>> 	local conf_tar="/tmp/sysupgrade.tgz"
>>> -	
>>> +
>>> 	sync
>>> 	[ -f "$conf_tar" ] && nand_restore_config "$conf_tar"
>>> 	echo "sysupgrade successful"
>>> @@ -231,7 +231,7 @@ nand_upgrade_ubifs() {
>>> 	local rootfs_length=`(cat $1 | wc -c) 2> /dev/null`
>>> 
>>> 	nand_upgrade_prepare_ubi "$rootfs_length" "ubifs" "0" "0"
>>> -	
>>> +
>> 
>> 
>> Please avoid whitespace-only changes.
> 
> Well, this is trailing whitespace, which every sensible editor should strip
> automatically (or at least warn about it). In my opinion, this change
> should be done, as a lot of developers will stumble over it, and would have
> to reconfigure their editors or exclude the changes from their commits…


Okay, what happens if someone else (with the same editor settings) is in the file at the same time working on a PR?  Then they will also try to correct the whitespace stuff, and their commit will need to be rebased and hand-edited if your commits go in first (or alternatively, your commits will need to be rebased and hand-edited if theirs goes in first).

Simpler just to clean all of that up in a single commit which does nothing else, and then set the pre-commit hook to check for PR’s which re-introduce trailing whitespace and reject them before they get merged.

No argument about whether it should be done.  Just about the “how” and “when”.

-Philip



> 
> 
>> 
>> 
>>> 	local ubidev="$( nand_find_ubi "$CI_UBIPART" )"
>>> 	local root_ubivol="$(nand_find_volume $ubidev rootfs)"
>>> 	ubiupdatevol /dev/$root_ubivol -s $rootfs_length $1
>>> @@ -333,7 +333,7 @@ nand_upgrade_stage1() {
>>> 		[ "$SAVE_CONFIG" != 1 -a -f "$CONF_TAR" ] &&
>>> 			rm $CONF_TAR
>>> 
>>> -		ubus call system nandupgrade "{\"path\": \"$path\" }"
>>> +		ubus call system nandupgrade "{\"prefix\": \"$RAM_ROOT\", \"path\": \"$path\" }"
>>> 		exit 0
>>> 	}
>>> }
>>> @@ -370,6 +370,7 @@ nand_do_platform_check() {
>>> # $(1): file to be used for upgrade
>>> nand_do_upgrade() {
>>> 	echo -n $1 > /tmp/sysupgrade-nand-path
>>> -	cp /sbin/upgraded /tmp/
>>> +	install_bin /sbin/upgraded
>>> +	ln -s "$RAM_ROOT"/sbin/upgraded /tmp/upgraded
>>> 	nand_upgrade_stage1
>>> }
>>> -- 
>>> 2.12.2
>>>