diff mbox series

[2/2] package/psplash: add support to missing configure options

Message ID 20211115133000.72041-2-kory.maincent@bootlin.com
State Superseded
Headers show
Series [1/2] package/psplash: bump to revision 44afb75 | expand

Commit Message

Kory Maincent Nov. 15, 2021, 1:30 p.m. UTC
Add support to three configure options:
--disable-startup-msg: Disable text banner output on startup
--disable-progress-bar: Disable progress bar
--enable-img-fullscreen: Enable the logo image in fullscreen mode

Signed-off-by: Kory Maincent <kory.maincent@bootlin.com>
---
 package/psplash/.Config.in.swp | Bin 0 -> 12288 bytes
 package/psplash/Config.in      |  15 +++++++++++++++
 package/psplash/psplash.mk     |  12 ++++++++++++
 3 files changed, 27 insertions(+)
 create mode 100644 package/psplash/.Config.in.swp

Comments

Quentin Schulz Nov. 15, 2021, 1:47 p.m. UTC | #1
Hi Köry,

On Mon, Nov 15, 2021 at 02:30:00PM +0100, Kory Maincent wrote:
> Add support to three configure options:
> --disable-startup-msg: Disable text banner output on startup
> --disable-progress-bar: Disable progress bar
> --enable-img-fullscreen: Enable the logo image in fullscreen mode
> 
> Signed-off-by: Kory Maincent <kory.maincent@bootlin.com>
> ---
>  package/psplash/.Config.in.swp | Bin 0 -> 12288 bytes
>  package/psplash/Config.in      |  15 +++++++++++++++
>  package/psplash/psplash.mk     |  12 ++++++++++++
>  3 files changed, 27 insertions(+)
>  create mode 100644 package/psplash/.Config.in.swp
> 
> diff --git a/package/psplash/.Config.in.swp b/package/psplash/.Config.in.swp
> new file mode 100644
> index 0000000000000000000000000000000000000000..e484556922e96c824ecda0725e674bc8223d8d00
> GIT binary patch
> literal 12288
> zcmeHNO>Y}T7@lwd0<<8wfso$15&=Z*e6$dy0?7?d8j%kZ$G`z(jdy45Np@#eJF{`z
> z14tlo;{yDMN_?G=KwLQS4>%!}18_hH^(T~PcGp%KHR+jZ96j01?mO?t^L{8%-v0bM
> z8(XwoUtst=#n^AJea>%w_r}a4Uz}$LIvcyk_xtp78Ha^}vn4-t3L9yr_eEe$BOEKO
> zdi+poB?Hqav}9V_M#_T&J`j!6q%k+c#;R749Mq*cTfKkl8So68#z1bPOUvij(&ECr
> z6S-KsK+ingJx$s__Y8OjJOiEq&wyvZGvFEU40r|}Kn83&!#+Y>4^^=(SJ#;n*Xl=q
> z@eFtdJOiEq&wyvZGvFEU40r}S1D*lTfM?);$N&!+yZtC*|IEU9{QrOQ_y1o{GWIL*
> z6YxE719%;{bDpuEfiD592(b5n=YVH{Tjv<N348*43>*O+U=dgV?mWTR@4zkK7vO8)
> zD<B6f@B#2Xa22=+JP-W)IAh-e-vFNi`#=a>29|(X;P1y6`vdq9_yPC~NP&IeDzE}v
> z29|(_0T=6^E?)of40r}S1D*lTfM>un@Srj<8<t-p6)H5O6<xTtyV&b?TD^ByuQzvD
> zpp!%>OSNj{l9Uh-<YcvugCUoSMhzO_E~_yHB{IUVUPNz7!~3xyI~0^~g{93xjgE>Z
> z*z_D^!WioFtj=bKB2L+C9~!9^RtJxZ)Zm6&^d#q7ySe&SbG_ATciNlH&h_5*POrVY
> zv%cHvbb8m|@m<!%k%bMVL`FKdX>MJJ#`4VO=_!V*x0Jv?xP3p{oxSGnUbo%b>Z}*0
> zTWT8jgff{x4}qyDk7E;LLMTdfC{8$#8*x(NOyg_a&COnCb+^^pE-Y^fOVW}^QadIY
> z(OBm+;>exVbRa}pGGA`aQYa#x$2j18gCj&;nCFy=%xJ}9c|(MhszE709I3(rE|sUJ
> zjvJdv$V`i)&~~QN8(YX7V{q>txh%pMTAQvk8UtzTV;xvsZ3WkLHfRKRT70YHZn_0r
> z93!gezBJ0D6;yk>yRlbufxS$7B1@#=cv{J<-1`V}NRiek%IYAh7>mZ^Ni9&VdP}^o
> z525W?8K0tZQkrySzS7x2nvNfI>A5oRh!4<cD`hH>lv1JVzZ_f8++rD;M$!%^F_du@
> zsY|sn65Up(ZEeNMM1oLi2-<b)+Q!<BtH6d$QiPZ}D;?JcMNxzqAGtijt-y6<VP<Yp
> zzL(SsbFKgc&*Cv|3htzWmZbCw0Ze2~9t@|&GL7<>aN%z=HX7apaUP<|q;qgCh$X_G
> zBNs4NA>~%a5`_#iWZYa)gVL~ph#LlZRy10Fj0QI{Aft0INSH)wAWUJWd{Go7Y(S}X
> z^T6FeD2%~Orfm^Joi?nYLuqmzQ>^uYBPhyvBKmn0iOjvnAw!WEp?BQ06e^I=@Zx@M
> zEXA@Pyz~m0JWX|GjXRxSHi9pa^hM~x+>|Om!r4O!jwh0ibxsSf_S2LQ=+Yu?+~Ibo
> wSa2`7!C=S?R^J5;GM)}m4Ds=9q-vxTX)Q-->0vR??;hvXkgd{nR;RN60O4Ltxc~qF
> 
> literal 0
> HcmV?d00001
> 

Greetings fellow vim user :) I assume you didn't want this in your patch
:)

Cheers,
Quentin
Thomas Petazzoni Nov. 15, 2021, 2:38 p.m. UTC | #2
On Mon, 15 Nov 2021 14:30:00 +0100
Kory Maincent <kory.maincent@bootlin.com> wrote:

> Add support to three configure options:
> --disable-startup-msg: Disable text banner output on startup
> --disable-progress-bar: Disable progress bar
> --enable-img-fullscreen: Enable the logo image in fullscreen mode
> 
> Signed-off-by: Kory Maincent <kory.maincent@bootlin.com>
> ---
>  package/psplash/.Config.in.swp | Bin 0 -> 12288 bytes

Are you sure we want this file in Buildroot ? :-)

Thomas
Kory Maincent Nov. 15, 2021, 3:21 p.m. UTC | #3
Hello Quentin and Thomas,

On Mon, 15 Nov 2021 14:47:03 +0100
Quentin Schulz <quentin.schulz@theobroma-systems.com> wrote:

> > Signed-off-by: Kory Maincent <kory.maincent@bootlin.com>
> > ---
> >  package/psplash/.Config.in.swp | Bin 0 -> 12288 bytes
> >  package/psplash/Config.in      |  15 +++++++++++++++
> >  package/psplash/psplash.mk     |  12 ++++++++++++
> >  3 files changed, 27 insertions(+)
> >  create mode 100644 package/psplash/.Config.in.swp
> > HcmV?d00001
> >   
> 
> Greetings fellow vim user :) I assume you didn't want this in your patch
> :)

vim 4 life ! ;)
Oops, sorry for this crap.

Köry
Baruch Siach Nov. 15, 2021, 3:37 p.m. UTC | #4
Hi Thomas,

On Mon, Nov 15 2021, Thomas Petazzoni wrote:
> On Mon, 15 Nov 2021 14:30:00 +0100
> Kory Maincent <kory.maincent@bootlin.com> wrote:
>
>> Add support to three configure options:
>> --disable-startup-msg: Disable text banner output on startup
>> --disable-progress-bar: Disable progress bar
>> --enable-img-fullscreen: Enable the logo image in fullscreen mode
>> 
>> Signed-off-by: Kory Maincent <kory.maincent@bootlin.com>
>> ---
>>  package/psplash/.Config.in.swp | Bin 0 -> 12288 bytes
>
> Are you sure we want this file in Buildroot ? :-)

A file of this name is already in current master branch. Introduced in
commit 70440e28c8eef ("package/python-pudb: bump to version 2021.1").

baruch
Thomas Petazzoni Nov. 15, 2021, 3:50 p.m. UTC | #5
On Mon, 15 Nov 2021 17:37:49 +0200
Baruch Siach <baruch@tkos.co.il> wrote:

> Hi Thomas,
> 
> On Mon, Nov 15 2021, Thomas Petazzoni wrote:
> > On Mon, 15 Nov 2021 14:30:00 +0100
> > Kory Maincent <kory.maincent@bootlin.com> wrote:
> >  
> >> Add support to three configure options:
> >> --disable-startup-msg: Disable text banner output on startup
> >> --disable-progress-bar: Disable progress bar
> >> --enable-img-fullscreen: Enable the logo image in fullscreen mode
> >> 
> >> Signed-off-by: Kory Maincent <kory.maincent@bootlin.com>
> >> ---
> >>  package/psplash/.Config.in.swp | Bin 0 -> 12288 bytes  
> >
> > Are you sure we want this file in Buildroot ? :-)  
> 
> A file of this name is already in current master branch. Introduced in
> commit 70440e28c8eef ("package/python-pudb: bump to version 2021.1").

I was confused initially, I thought you said
package/psplash/.Config.in.swp already existed, but it's .Config.in.swp
in the python-pudb package. We definitely want to get rid of it, indeed.

As an Emacs user, should I also suggest to forbid the usage of vim? :-)

Thomas
Baruch Siach Nov. 15, 2021, 4:01 p.m. UTC | #6
Hi Thomas,

On Mon, Nov 15 2021, Thomas Petazzoni wrote:
> On Mon, 15 Nov 2021 17:37:49 +0200
> Baruch Siach <baruch@tkos.co.il> wrote:
>> On Mon, Nov 15 2021, Thomas Petazzoni wrote:
>> > On Mon, 15 Nov 2021 14:30:00 +0100
>> > Kory Maincent <kory.maincent@bootlin.com> wrote:
>> >  
>> >> Add support to three configure options:
>> >> --disable-startup-msg: Disable text banner output on startup
>> >> --disable-progress-bar: Disable progress bar
>> >> --enable-img-fullscreen: Enable the logo image in fullscreen mode
>> >> 
>> >> Signed-off-by: Kory Maincent <kory.maincent@bootlin.com>
>> >> ---
>> >>  package/psplash/.Config.in.swp | Bin 0 -> 12288 bytes  
>> >
>> > Are you sure we want this file in Buildroot ? :-)  
>> 
>> A file of this name is already in current master branch. Introduced in
>> commit 70440e28c8eef ("package/python-pudb: bump to version 2021.1").
>
> I was confused initially, I thought you said
> package/psplash/.Config.in.swp already existed, but it's .Config.in.swp
> in the python-pudb package. We definitely want to get rid of it, indeed.
>
> As an Emacs user, should I also suggest to forbid the usage of vim? :-)

Or we can add '*.swp' or '.*' patterns to top level .gitignore. The
kernel has the latter.

I have '*.swp' in .git/info/exclude for the same effect.

baruch
Yann E. MORIN Nov. 15, 2021, 4:48 p.m. UTC | #7
Baruch, All,

On 2021-11-15 17:37 +0200, Baruch Siach via buildroot spake thusly:
> On Mon, Nov 15 2021, Thomas Petazzoni wrote:
> > On Mon, 15 Nov 2021 14:30:00 +0100
> > Kory Maincent <kory.maincent@bootlin.com> wrote:
> >
> >> Add support to three configure options:
> >> --disable-startup-msg: Disable text banner output on startup
> >> --disable-progress-bar: Disable progress bar
> >> --enable-img-fullscreen: Enable the logo image in fullscreen mode
> >> 
> >> Signed-off-by: Kory Maincent <kory.maincent@bootlin.com>
> >> ---
> >>  package/psplash/.Config.in.swp | Bin 0 -> 12288 bytes
> >
> > Are you sure we want this file in Buildroot ? :-)
> 
> A file of this name is already in current master branch. Introduced in
> commit 70440e28c8eef ("package/python-pudb: bump to version 2021.1").

Thanks for the report! I've cleaned up my mess now, by pushing commit
5f92c032369e. Thanks!

Regards,
Yann E. MORIN.
diff mbox series

Patch

diff --git a/package/psplash/.Config.in.swp b/package/psplash/.Config.in.swp
new file mode 100644
index 0000000000000000000000000000000000000000..e484556922e96c824ecda0725e674bc8223d8d00
GIT binary patch
literal 12288
zcmeHNO>Y}T7@lwd0<<8wfso$15&=Z*e6$dy0?7?d8j%kZ$G`z(jdy45Np@#eJF{`z
z14tlo;{yDMN_?G=KwLQS4>%!}18_hH^(T~PcGp%KHR+jZ96j01?mO?t^L{8%-v0bM
z8(XwoUtst=#n^AJea>%w_r}a4Uz}$LIvcyk_xtp78Ha^}vn4-t3L9yr_eEe$BOEKO
zdi+poB?Hqav}9V_M#_T&J`j!6q%k+c#;R749Mq*cTfKkl8So68#z1bPOUvij(&ECr
z6S-KsK+ingJx$s__Y8OjJOiEq&wyvZGvFEU40r|}Kn83&!#+Y>4^^=(SJ#;n*Xl=q
z@eFtdJOiEq&wyvZGvFEU40r}S1D*lTfM?);$N&!+yZtC*|IEU9{QrOQ_y1o{GWIL*
z6YxE719%;{bDpuEfiD592(b5n=YVH{Tjv<N348*43>*O+U=dgV?mWTR@4zkK7vO8)
zD<B6f@B#2Xa22=+JP-W)IAh-e-vFNi`#=a>29|(X;P1y6`vdq9_yPC~NP&IeDzE}v
z29|(_0T=6^E?)of40r}S1D*lTfM>un@Srj<8<t-p6)H5O6<xTtyV&b?TD^ByuQzvD
zpp!%>OSNj{l9Uh-<YcvugCUoSMhzO_E~_yHB{IUVUPNz7!~3xyI~0^~g{93xjgE>Z
z*z_D^!WioFtj=bKB2L+C9~!9^RtJxZ)Zm6&^d#q7ySe&SbG_ATciNlH&h_5*POrVY
zv%cHvbb8m|@m<!%k%bMVL`FKdX>MJJ#`4VO=_!V*x0Jv?xP3p{oxSGnUbo%b>Z}*0
zTWT8jgff{x4}qyDk7E;LLMTdfC{8$#8*x(NOyg_a&COnCb+^^pE-Y^fOVW}^QadIY
z(OBm+;>exVbRa}pGGA`aQYa#x$2j18gCj&;nCFy=%xJ}9c|(MhszE709I3(rE|sUJ
zjvJdv$V`i)&~~QN8(YX7V{q>txh%pMTAQvk8UtzTV;xvsZ3WkLHfRKRT70YHZn_0r
z93!gezBJ0D6;yk>yRlbufxS$7B1@#=cv{J<-1`V}NRiek%IYAh7>mZ^Ni9&VdP}^o
z525W?8K0tZQkrySzS7x2nvNfI>A5oRh!4<cD`hH>lv1JVzZ_f8++rD;M$!%^F_du@
zsY|sn65Up(ZEeNMM1oLi2-<b)+Q!<BtH6d$QiPZ}D;?JcMNxzqAGtijt-y6<VP<Yp
zzL(SsbFKgc&*Cv|3htzWmZbCw0Ze2~9t@|&GL7<>aN%z=HX7apaUP<|q;qgCh$X_G
zBNs4NA>~%a5`_#iWZYa)gVL~ph#LlZRy10Fj0QI{Aft0INSH)wAWUJWd{Go7Y(S}X
z^T6FeD2%~Orfm^Joi?nYLuqmzQ>^uYBPhyvBKmn0iOjvnAw!WEp?BQ06e^I=@Zx@M
zEXA@Pyz~m0JWX|GjXRxSHi9pa^hM~x+>|Om!r4O!jwh0ibxsSf_S2LQ=+Yu?+~Ibo
wSa2`7!C=S?R^J5;GM)}m4Ds=9q-vxTX)Q-->0vR??;hvXkgd{nR;RN60O4Ltxc~qF

literal 0
HcmV?d00001

diff --git a/package/psplash/Config.in b/package/psplash/Config.in
index da99b264e0..e79e9e85c4 100644
--- a/package/psplash/Config.in
+++ b/package/psplash/Config.in
@@ -35,6 +35,21 @@  config BR2_PACKAGE_PSPLASH_IMAGE
 	  Use a personalized png image as boot splash.
 	  Let it empty if you want to keep the psplash default image.
 
+config BR2_PACKAGE_PSPLASH_FULL_SCREEN
+	bool "use fullscreen mode"
+	help
+	  Enable the psplash image in fullscreen mode.
+
+config BR2_PACKAGE_PSPLASH_NO_STARTUP_MSG
+	bool "disable startup message"
+	help
+	  Disable text banner output on startup.
+
+config BR2_PACKAGE_PSPLASH_NO_PROGRESS_BAR
+	bool "disable progress bar"
+	help
+	  Disable the management of the progress bar.
+
 endif
 
 comment "psplash needs a toolchain w/ wchar"
diff --git a/package/psplash/psplash.mk b/package/psplash/psplash.mk
index 5e61f2392f..a7d36697a6 100644
--- a/package/psplash/psplash.mk
+++ b/package/psplash/psplash.mk
@@ -18,6 +18,18 @@  else
 PSPLASH_CONF_OPTS += --without-systemd
 endif
 
+ifeq ($(BR2_PACKAGE_PSPLASH_FULL_SCREEN),y)
+PSPLASH_CONF_OPTS += --enable-img-fullscreen
+endif
+
+ifeq ($(BR2_PACKAGE_PSPLASH_NO_STARTUP_MSG),y)
+PSPLASH_CONF_OPTS += --disable-startup-msg
+endif
+
+ifeq ($(BR2_PACKAGE_PSPLASH_NO_PROGRESS_BAR),y)
+PSPLASH_CONF_OPTS += --disable-progress-bar
+endif
+
 PSPLASH_IMAGE = $(call qstrip,$(BR2_PACKAGE_PSPLASH_IMAGE))
 
 ifneq ($(PSPLASH_IMAGE),)