Patchwork base-files: fix 'dash' expanding '\n'

login
register
mail settings
Submitter Javier Viguera
Date Feb. 20, 2013, 3:09 p.m.
Message ID <1361372957-38860-1-git-send-email-javier.viguera@digi.com>
Download mbox | patch
Permalink /patch/44935/
State Accepted
Commit 94c9ced84aa201e808e46e129bf14f328ff5f3e4
Headers show

Comments

Javier Viguera - Feb. 20, 2013, 3:09 p.m.
Dash's 'echo' command expands '\n' by default, so the '\n' is not
included in the '/etc/issue' file.

Use 'printf' for portability between different shells.

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
---

Probably also worth to be cherry-picked to 'danny' branch.

 meta/recipes-core/base-files/base-files_3.0.14.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Javier Viguera - Feb. 26, 2013, 5:24 p.m.
Hi all,

I just saw this patch i sent last week was pushed to 
openembedded-core/poky *master* branches. Thanks for that.

But in my development i am using stable 'danny' branches.

Any chance that this patch gets cherry-picked to 'danny' on 
openembedded-core and poky repos?

-
Javier Viguera
Software Engineer
Digi International® Spain S.A.U.


On 02/20/2013 04:09 PM, Javier Viguera wrote:
> Dash's 'echo' command expands '\n' by default, so the '\n' is not
> included in the '/etc/issue' file.
>
> Use 'printf' for portability between different shells.
>
> Signed-off-by: Javier Viguera <javier.viguera@digi.com>
> ---
>
> Probably also worth to be cherry-picked to 'danny' branch.
>
>   meta/recipes-core/base-files/base-files_3.0.14.bb | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meta/recipes-core/base-files/base-files_3.0.14.bb b/meta/recipes-core/base-files/base-files_3.0.14.bb
> index 6a3db50..e7a9d82 100644
> --- a/meta/recipes-core/base-files/base-files_3.0.14.bb
> +++ b/meta/recipes-core/base-files/base-files_3.0.14.bb
> @@ -129,7 +129,7 @@ do_install_basefilesissue () {
>   			printf "${DISTRO_VERSION} " >> ${D}${sysconfdir}/issue
>   			printf "${DISTRO_VERSION} " >> ${D}${sysconfdir}/issue.net
>   		fi
> -		echo "\n \l" >> ${D}${sysconfdir}/issue
> +		printf "\\\n \\\l\n" >> ${D}${sysconfdir}/issue
>   		echo >> ${D}${sysconfdir}/issue
>   		echo "%h"    >> ${D}${sysconfdir}/issue.net
>   		echo >> ${D}${sysconfdir}/issue.net
>
Saul Wold - Feb. 26, 2013, 5:29 p.m.
On 02/26/2013 09:24 AM, Javier Viguera wrote:
> Hi all,
>
> I just saw this patch i sent last week was pushed to
> openembedded-core/poky *master* branches. Thanks for that.
>
> But in my development i am using stable 'danny' branches.
>
> Any chance that this patch gets cherry-picked to 'danny' on
> openembedded-core and poky repos?
>
In the future, patches for Stable releases should mention that in the 
patch request.  We are spinning the rc1 of Danny Update (1.3.1) now, so 
it will not make this release, but could be considered for the next one.

Thanks for your contribution

	Sau!

> -
> Javier Viguera
> Software Engineer
> Digi International® Spain S.A.U.
>
>
> On 02/20/2013 04:09 PM, Javier Viguera wrote:
>> Dash's 'echo' command expands '\n' by default, so the '\n' is not
>> included in the '/etc/issue' file.
>>
>> Use 'printf' for portability between different shells.
>>
>> Signed-off-by: Javier Viguera <javier.viguera@digi.com>
>> ---
>>
>> Probably also worth to be cherry-picked to 'danny' branch.
>>
>>   meta/recipes-core/base-files/base-files_3.0.14.bb | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/meta/recipes-core/base-files/base-files_3.0.14.bb
>> b/meta/recipes-core/base-files/base-files_3.0.14.bb
>> index 6a3db50..e7a9d82 100644
>> --- a/meta/recipes-core/base-files/base-files_3.0.14.bb
>> +++ b/meta/recipes-core/base-files/base-files_3.0.14.bb
>> @@ -129,7 +129,7 @@ do_install_basefilesissue () {
>>               printf "${DISTRO_VERSION} " >> ${D}${sysconfdir}/issue
>>               printf "${DISTRO_VERSION} " >> ${D}${sysconfdir}/issue.net
>>           fi
>> -        echo "\n \l" >> ${D}${sysconfdir}/issue
>> +        printf "\\\n \\\l\n" >> ${D}${sysconfdir}/issue
>>           echo >> ${D}${sysconfdir}/issue
>>           echo "%h"    >> ${D}${sysconfdir}/issue.net
>>           echo >> ${D}${sysconfdir}/issue.net
>>
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>
>
Ross Burton - Feb. 27, 2013, 1:48 p.m.
On 26 February 2013 17:24, Javier Viguera <javier.viguera@digi.com> wrote:
> Any chance that this patch gets cherry-picked to 'danny' on
> openembedded-core and poky repos?

Integrated into the danny-next branch but unless the current 1.3.1 RC
goes terribly wrong this will have to wait until 1.3.2.

Ross

Patch

diff --git a/meta/recipes-core/base-files/base-files_3.0.14.bb b/meta/recipes-core/base-files/base-files_3.0.14.bb
index 6a3db50..e7a9d82 100644
--- a/meta/recipes-core/base-files/base-files_3.0.14.bb
+++ b/meta/recipes-core/base-files/base-files_3.0.14.bb
@@ -129,7 +129,7 @@  do_install_basefilesissue () {
 			printf "${DISTRO_VERSION} " >> ${D}${sysconfdir}/issue
 			printf "${DISTRO_VERSION} " >> ${D}${sysconfdir}/issue.net
 		fi
-		echo "\n \l" >> ${D}${sysconfdir}/issue
+		printf "\\\n \\\l\n" >> ${D}${sysconfdir}/issue
 		echo >> ${D}${sysconfdir}/issue
 		echo "%h"    >> ${D}${sysconfdir}/issue.net
 		echo >> ${D}${sysconfdir}/issue.net