diff mbox series

builddeb: Fix build on non-Debian/Ubuntu distros

Message ID 20201030165607.290612-1-petr.vorel@gmail.com (mailing list archive)
State New
Headers show
Series builddeb: Fix build on non-Debian/Ubuntu distros | expand

Commit Message

Petr Vorel Oct. 30, 2020, 4:56 p.m. UTC
This fixes make bindeb-pkg for RPM based distros, which don't have
dpkg-dev (and thus not /usr/bin/dpkg-buildpackage), which sets
$DEB_RULES_REQUIRES_ROOT.

Fixes: 3e8541803624 ("builddeb: Enable rootless builds")

Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
---
Hi,

I admit not many people compile kernel with bindeb-pkg on  RPM based
distro, but it'd be nice it were working.

openSUSE has most of other required packages, although there are some
missing dependencies, thus DPKG_FLAGS="-d" is needed.

Kind regards,
Petr

 scripts/package/builddeb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Ben Hutchings Oct. 30, 2020, 5:14 p.m. UTC | #1
On Fri, 2020-10-30 at 17:56 +0100, Petr Vorel wrote:
> This fixes make bindeb-pkg for RPM based distros, which don't have
> dpkg-dev (and thus not /usr/bin/dpkg-buildpackage), which sets
> $DEB_RULES_REQUIRES_ROOT.
> 
> Fixes: 3e8541803624 ("builddeb: Enable rootless builds")

This doesn't seem to fix a bug, and in fact it would introduce one.

> Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
[...]
> --- a/scripts/package/builddeb
> +++ b/scripts/package/builddeb
> @@ -37,7 +37,7 @@ create_package() {
>                 | xargs -r0 md5sum > DEBIAN/md5sums"
>  
>         # Fix ownership and permissions
> -       if [ "$DEB_RULES_REQUIRES_ROOT" = "no" ]; then
> +       if [ -z "$DEB_RULES_REQUIRES_ROOT" -o "$DEB_RULES_REQUIRES_ROOT" = "no" ]; then
>                 dpkg_deb_opts="--root-owner-group"
>         else
>                 chown -R root:root "$pdir"

This is the wrong default behaviour; it will cause a regression with
older versions of dpkg that don't support this option.

If you invoke this script directly and do not use dpkg-buildpackage
(which I don't think is really supported anyway) then you must either
do so as root or use fakeroot (as dpkg-buildpackage does by default).

Ben.
Petr Vorel Oct. 30, 2020, 6:57 p.m. UTC | #2
Hi Ben,

first, thanks for your review.

> On Fri, 2020-10-30 at 17:56 +0100, Petr Vorel wrote:
> > This fixes make bindeb-pkg for RPM based distros, which don't have
> > dpkg-dev (and thus not /usr/bin/dpkg-buildpackage), which sets
> > $DEB_RULES_REQUIRES_ROOT.

> > Fixes: 3e8541803624 ("builddeb: Enable rootless builds")

> This doesn't seem to fix a bug, and in fact it would introduce one.

> > Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
> [...]
> > --- a/scripts/package/builddeb
> > +++ b/scripts/package/builddeb
> > @@ -37,7 +37,7 @@ create_package() {
> >                 | xargs -r0 md5sum > DEBIAN/md5sums"

> >         # Fix ownership and permissions
> > -       if [ "$DEB_RULES_REQUIRES_ROOT" = "no" ]; then
> > +       if [ -z "$DEB_RULES_REQUIRES_ROOT" -o "$DEB_RULES_REQUIRES_ROOT" = "no" ]; then
> >                 dpkg_deb_opts="--root-owner-group"
> >         else
> >                 chown -R root:root "$pdir"

> This is the wrong default behaviour; it will cause a regression with
> older versions of dpkg that don't support this option.
Sorry for wrong report. I tested it on Debian, but only on unstable.

> If you invoke this script directly and do not use dpkg-buildpackage
> (which I don't think is really supported anyway) then you must either
> do so as root or use fakeroot (as dpkg-buildpackage does by default).
Well, both bindeb-pkg and deb-pkg use dpkg-buildpackage.
Thus fakeroot is used by default.

/bin/sh -c dpkg-buildpackage -r"fakeroot -u" -a$(cat debian/arch) -d -b -nc -uc

The root cause is that while calling chown -R root:root "$pdir" is ok on Debian,
it's refused for fakeroot in openSUSE. I can run it with
DEB_RULES_REQUIRES_ROOT=no, that should fix that, but I'd prefer it were working
by default (although I admit not many people need it).
I reported it because the default setup worked before 3e8541803624.
I'll have a look what configuration (permission) is missing on openSUSE to allow
chown -R root:root for non-root user.

> Ben.

Kind regards,
Petr
Masahiro Yamada Nov. 2, 2020, 8:35 a.m. UTC | #3
On Sat, Oct 31, 2020 at 3:58 AM Petr Vorel <petr.vorel@gmail.com> wrote:
>
> Hi Ben,
>
> first, thanks for your review.
>
> > On Fri, 2020-10-30 at 17:56 +0100, Petr Vorel wrote:
> > > This fixes make bindeb-pkg for RPM based distros, which don't have
> > > dpkg-dev (and thus not /usr/bin/dpkg-buildpackage), which sets
> > > $DEB_RULES_REQUIRES_ROOT.
>
> > > Fixes: 3e8541803624 ("builddeb: Enable rootless builds")
>
> > This doesn't seem to fix a bug, and in fact it would introduce one.
>
> > > Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
> > [...]
> > > --- a/scripts/package/builddeb
> > > +++ b/scripts/package/builddeb
> > > @@ -37,7 +37,7 @@ create_package() {
> > >                 | xargs -r0 md5sum > DEBIAN/md5sums"
>
> > >         # Fix ownership and permissions
> > > -       if [ "$DEB_RULES_REQUIRES_ROOT" = "no" ]; then
> > > +       if [ -z "$DEB_RULES_REQUIRES_ROOT" -o "$DEB_RULES_REQUIRES_ROOT" = "no" ]; then
> > >                 dpkg_deb_opts="--root-owner-group"
> > >         else
> > >                 chown -R root:root "$pdir"
>
> > This is the wrong default behaviour; it will cause a regression with
> > older versions of dpkg that don't support this option.
> Sorry for wrong report. I tested it on Debian, but only on unstable.
>
> > If you invoke this script directly and do not use dpkg-buildpackage
> > (which I don't think is really supported anyway) then you must either
> > do so as root or use fakeroot (as dpkg-buildpackage does by default).
> Well, both bindeb-pkg and deb-pkg use dpkg-buildpackage.
> Thus fakeroot is used by default.
>
> /bin/sh -c dpkg-buildpackage -r"fakeroot -u" -a$(cat debian/arch) -d -b -nc -uc
>
> The root cause is that while calling chown -R root:root "$pdir" is ok on Debian,
> it's refused for fakeroot in openSUSE. I can run it with
> DEB_RULES_REQUIRES_ROOT=no, that should fix that, but I'd prefer it were working
> by default (although I admit not many people need it).
> I reported it because the default setup worked before 3e8541803624.
> I'll have a look what configuration (permission) is missing on openSUSE to allow
> chown -R root:root for non-root user.
>
> > Ben.
>
> Kind regards,
> Petr



I do not know what is different on openSUSE, but
my understanding is like follows:



For old dpkg tools (which does not know "Rules-Requires-Root: no"),
$DEB_RULES_REQUIRES_ROOT is empty.
-> We run chown -R root:root like before.


For new dpkg tools (which knows "Rules-Requires-Root: no"),
$DEB_RULES_REQUIRES_ROOT is "no".
-> We pass --root-owner-group to dpkg-deb.







--
Best Regards
Masahiro Yamada
Petr Vorel Nov. 2, 2020, 7:05 p.m. UTC | #4
> On Sat, Oct 31, 2020 at 3:58 AM Petr Vorel <petr.vorel@gmail.com> wrote:

> > Hi Ben,

> > first, thanks for your review.

> > > On Fri, 2020-10-30 at 17:56 +0100, Petr Vorel wrote:
> > > > This fixes make bindeb-pkg for RPM based distros, which don't have
> > > > dpkg-dev (and thus not /usr/bin/dpkg-buildpackage), which sets
> > > > $DEB_RULES_REQUIRES_ROOT.

> > > > Fixes: 3e8541803624 ("builddeb: Enable rootless builds")

> > > This doesn't seem to fix a bug, and in fact it would introduce one.

> > > > Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
> > > [...]
> > > > --- a/scripts/package/builddeb
> > > > +++ b/scripts/package/builddeb
> > > > @@ -37,7 +37,7 @@ create_package() {
> > > >                 | xargs -r0 md5sum > DEBIAN/md5sums"

> > > >         # Fix ownership and permissions
> > > > -       if [ "$DEB_RULES_REQUIRES_ROOT" = "no" ]; then
> > > > +       if [ -z "$DEB_RULES_REQUIRES_ROOT" -o "$DEB_RULES_REQUIRES_ROOT" = "no" ]; then
> > > >                 dpkg_deb_opts="--root-owner-group"
> > > >         else
> > > >                 chown -R root:root "$pdir"

> > > This is the wrong default behaviour; it will cause a regression with
> > > older versions of dpkg that don't support this option.
> > Sorry for wrong report. I tested it on Debian, but only on unstable.

> > > If you invoke this script directly and do not use dpkg-buildpackage
> > > (which I don't think is really supported anyway) then you must either
> > > do so as root or use fakeroot (as dpkg-buildpackage does by default).
> > Well, both bindeb-pkg and deb-pkg use dpkg-buildpackage.
> > Thus fakeroot is used by default.

> > /bin/sh -c dpkg-buildpackage -r"fakeroot -u" -a$(cat debian/arch) -d -b -nc -uc

> > The root cause is that while calling chown -R root:root "$pdir" is ok on Debian,
> > it's refused for fakeroot in openSUSE. I can run it with
> > DEB_RULES_REQUIRES_ROOT=no, that should fix that, but I'd prefer it were working
> > by default (although I admit not many people need it).
> > I reported it because the default setup worked before 3e8541803624.
> > I'll have a look what configuration (permission) is missing on openSUSE to allow
> > chown -R root:root for non-root user.

> > > Ben.

> > Kind regards,
> > Petr



> I do not know what is different on openSUSE, but
> my understanding is like follows:



> For old dpkg tools (which does not know "Rules-Requires-Root: no"),
> $DEB_RULES_REQUIRES_ROOT is empty.
> -> We run chown -R root:root like before.


> For new dpkg tools (which knows "Rules-Requires-Root: no"),
> $DEB_RULES_REQUIRES_ROOT is "no".
> -> We pass --root-owner-group to dpkg-deb.

Yes. I'm using dpkg 1.19.0.4, which knows "Rules-Requires-Root: no", but does
not know --rules-requires-root (added in 1.19.1). export
DEB_RULES_REQUIRES_ROOT=no fixes the problem for my version (but that does not
break the build). I just wanted to save time for the others, but 1) there are
probably not many people using OBS to build Debian packages and 2) maybe it's
just me who does not know it.

It looks to me debhelper is not used for kernel Debian packaing, right?
At least building works even I don't have it.

As a result of this I'll also update openSUSE dpkg package to latest release.

Thanks all for explanation.

Kind regards,
Petr
diff mbox series

Patch

diff --git a/scripts/package/builddeb b/scripts/package/builddeb
index 1b11f8993629..287e4bbd222c 100755
--- a/scripts/package/builddeb
+++ b/scripts/package/builddeb
@@ -37,7 +37,7 @@  create_package() {
 		| xargs -r0 md5sum > DEBIAN/md5sums"
 
 	# Fix ownership and permissions
-	if [ "$DEB_RULES_REQUIRES_ROOT" = "no" ]; then
+	if [ -z "$DEB_RULES_REQUIRES_ROOT" -o "$DEB_RULES_REQUIRES_ROOT" = "no" ]; then
 		dpkg_deb_opts="--root-owner-group"
 	else
 		chown -R root:root "$pdir"