[Buildroot] [git commit] lighttpd: adjust Config.in to make check-package happy

[Buildroot] [git commit] lighttpd: adjust Config.in to make check-package happy

[Thomas Petazzoni]

commit: https://git.buildroot.net/buildroot/commit/?id=71f4f97d0aebe36c6399822840fe5301a5339b10
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master

Commit b9d75c717e01aed474b7567c969236418e87eda8 ("lighttpd: add
optional pam support") introduced a new Config.in option, but
check-package was not happy about it:

package/lighttpd/Config.in:30: should be indented with one tab (http://nightly.buildroot.org/#_config_files)
package/lighttpd/Config.in:31: should be indented with one tab (http://nightly.buildroot.org/#_config_files)
package/lighttpd/Config.in:32: attributes order: type, default, depends on, select, help (http://nightly.buildroot.org/#_config_files)
package/lighttpd/Config.in:32: should be indented with one tab (http://nightly.buildroot.org/#_config_files)
package/lighttpd/Config.in:33: should be indented with one tab (http://nightly.buildroot.org/#_config_files)
package/lighttpd/Config.in:34: help text: <tab><2 spaces><62 chars> (http://nightly.buildroot.org/#writing-rules-config-in)

This commit fixes those indentation and ordering issues.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---
 package/lighttpd/Config.in | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/package/lighttpd/Config.in b/package/lighttpd/Config.in
index 0f37422aea..7d75663629 100644
--- a/package/lighttpd/Config.in
+++ b/package/lighttpd/Config.in
@@ -27,11 +27,11 @@ config BR2_PACKAGE_LIGHTTPD_OPENSSL
 	  Enable OpenSSL support for lighttpd.
 
 config BR2_PACKAGE_LIGHTTPD_PAM
-       bool "pam authentication support"
-       depends on BR2_PACKAGE_LINUX_PAM
-       default y
-       help
-         Enable PAM authentication support for lighttpd.
+	bool "pam authentication support"
+	default y
+	depends on BR2_PACKAGE_LINUX_PAM
+	help
+	  Enable PAM authentication support for lighttpd.
 
 config BR2_PACKAGE_LIGHTTPD_ZLIB
 	bool "zlib support"

[Buildroot] [git commit] lighttpd: adjust Config.in to make check-package happy

[Peter Korsgaard]

>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@bootlin.com> writes:

 > commit: https://git.buildroot.net/buildroot/commit/?id=71f4f97d0aebe36c6399822840fe5301a5339b10
 > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master

 > Commit b9d75c717e01aed474b7567c969236418e87eda8 ("lighttpd: add
 > optional pam support") introduced a new Config.in option, but
 > check-package was not happy about it:

 > package/lighttpd/Config.in:30: should be indented with one tab (http://nightly.buildroot.org/#_config_files)
 > package/lighttpd/Config.in:31: should be indented with one tab (http://nightly.buildroot.org/#_config_files)
 > package/lighttpd/Config.in:32: attributes order: type, default, depends on, select, help (http://nightly.buildroot.org/#_config_files)
 > package/lighttpd/Config.in:32: should be indented with one tab (http://nightly.buildroot.org/#_config_files)
 > package/lighttpd/Config.in:33: should be indented with one tab (http://nightly.buildroot.org/#_config_files)
 > package/lighttpd/Config.in:34: help text: <tab><2 spaces><62 chars> (http://nightly.buildroot.org/#writing-rules-config-in)

 > This commit fixes those indentation and ordering issues.

Ups, wonder how that happened. I'll have a look at executing
check-package in a git pre-commit hook.

-- 
Bye, Peter Korsgaard

[Buildroot] [git commit] lighttpd: adjust Config.in to make check-package happy

[Thomas Petazzoni]

Hello,

On Wed, 31 Oct 2018 11:21:09 +0100, Peter Korsgaard wrote:

> Ups, wonder how that happened. I'll have a look at executing
> check-package in a git pre-commit hook.

If you do this, could you share whatever you have done? I'd like to
have this here as well, to avoid having such issues in the future.

Thanks,

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

[Buildroot] [git commit] lighttpd: adjust Config.in to make check-package happy

[Peter Korsgaard]

>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@bootlin.com> writes:

 > Hello,
 > On Wed, 31 Oct 2018 11:21:09 +0100, Peter Korsgaard wrote:

 >> Ups, wonder how that happened. I'll have a look at executing
 >> check-package in a git pre-commit hook.

 > If you do this, could you share whatever you have done? I'd like to
 > have this here as well, to avoid having such issues in the future.

I simply added a post-commit / post-applypatch script which runs 'make
checkpackage' for now.

A more optimal solution could be made which would only run it on
added/changed files, but I haven't tried that. Probably it can be done
with git show | lsdiff -s and then filter out removed (prefixed with -)
files.

-- 
Bye, Peter Korsgaard

[Buildroot] [git commit] lighttpd: adjust Config.in to make check-package happy

[Peter Korsgaard]

>>>>> "Peter" == Peter Korsgaard <peter@korsgaard.com> writes:

>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@bootlin.com> writes:
 >> Hello,
 >> On Wed, 31 Oct 2018 11:21:09 +0100, Peter Korsgaard wrote:

 >>> Ups, wonder how that happened. I'll have a look at executing
 >>> check-package in a git pre-commit hook.

 >> If you do this, could you share whatever you have done? I'd like to
 >> have this here as well, to avoid having such issues in the future.

 > I simply added a post-commit / post-applypatch script which runs 'make
 > checkpackage' for now.

 > A more optimal solution could be made which would only run it on
 > added/changed files, but I haven't tried that. Probably it can be done
 > with git show | lsdiff -s and then filter out removed (prefixed with -)
 > files.

I couldn't help doing it after all. Stick something like this into
.git/hooks/post-commit + .git/hooks/post-applypatch:

# check-package on added/changed files
git show HEAD | \
        lsdiff -s | \
        awk '{ if ($1 != "-") print substr($2, 3) }' | \
        xargs -r ./utils/check-package

-- 
Bye, Peter Korsgaard