Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix dracut Debian/Ubuntu packaging #8991

Merged
merged 1 commit into from
Jul 9, 2019
Merged

Conversation

loli10K
Copy link
Contributor

@loli10K loli10K commented Jul 4, 2019

Motivation and Context

Fix #8990

I expected the Debian/Ubuntu builders to detect this kind of issue, this needs more debugging.

Description

zfs-dracut package is "noarch" since ca4e5a7, alien(1) needs to know this to properly convert the dracut rpm.

To prevent future regression the make targets running alien to convert rpm->deb will now fail the build if they can't convert even a single file:

Putting child 0x5632c24cc770 (deb-utils) PID 12124 on the chain.
Live child 0x5632c24cc770 (deb-utils) PID 12124 
zfs_0.8.0-106_amd64.deb generated
libnvpair1_0.8.0-106_amd64.deb generated
libuutil1_0.8.0-106_amd64.deb generated
libzfs2_0.8.0-106_amd64.deb generated
libzpool2_0.8.0-106_amd64.deb generated
libzfs2-devel_0.8.0-106_amd64.deb generated
zfs-test_0.8.0-106_amd64.deb generated
zfs-dracut_0.8.0-106_amd64.deb generated
File "zfs-initramfs-0.8.0-106_gdf358db7c.x86_64.rpm" not found.
Reaping losing child 0x5632c24cc770 PID 12124 
Makefile:1381: recipe for target 'deb-utils' failed
make: *** [deb-utils] Error 1
Removing child 0x5632c24cc770 PID 12124 from chain.

How Has This Been Tested?

Tested on my local Debian builder, also with --disable-pyzfs:

...
fakeroot alien --bump=0 --scripts --to-deb --target=$debarch \
    $pkg1 $pkg2 $pkg3 $pkg4 $pkg5 $pkg6 $pkg7 \
    $pkg8 $pkg9 $pkg10 || exit 1; \
rm -f ${path_prepend}/dh_shlibdeps; \
rmdir ${path_prepend}; \
rm -f $pkg1 $pkg2 $pkg3 $pkg4 $pkg5 $pkg6 $pkg7 \
    $pkg8 $pkg9 $pkg10;
Putting child 0x562259f28e00 (deb-utils) PID 15890 on the chain.
Live child 0x562259f28e00 (deb-utils) PID 15890 
ls: cannot access 'python*-pyzfs-0.8.0-112_g67af199fb*': No such file or directory
zfs_0.8.0-112_amd64.deb generated
libnvpair1_0.8.0-112_amd64.deb generated
libuutil1_0.8.0-112_amd64.deb generated
libzfs2_0.8.0-112_amd64.deb generated
libzpool2_0.8.0-112_amd64.deb generated
libzfs2-devel_0.8.0-112_amd64.deb generated
zfs-test_0.8.0-112_amd64.deb generated
zfs-dracut_0.8.0-112_amd64.deb generated
zfs-initramfs_0.8.0-112_amd64.deb generated
Reaping winning child 0x562259f28e00 PID 15890 
Removing child 0x562259f28e00 PID 15890 from chain.
Successfully remade target file 'deb-utils'.
root@linux:/usr/src/zfs# echo $?
0
root@linux:/usr/src/zfs# head config.log 
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.

It was created by zfs configure 0.8.0, which was
generated by GNU Autoconf 2.69.  Invocation command line was

  $ ./configure --with-config=user --disable-pyzfs

## --------- ##
## Platform. ##

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Performance enhancement (non-breaking change which improves efficiency)
  • Code cleanup (non-breaking change which makes code smaller or more readable)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Documentation (a change to man pages or other documentation)

Checklist:

@loli10K loli10K added the Component: Packaging custom packages label Jul 4, 2019
@loli10K loli10K force-pushed the issue-8990 branch 2 times, most recently from 2cbca16 to 0d5dc25 Compare July 5, 2019 05:13
This commit ensures make(1) targets that build .deb packages fail if
alien(1) can't convert all .rpm files; additionally it also updates
the zfs-dracut package name which was changed to "noarch" in ca4e5a7.

Signed-off-by: loli10K <[email protected]>
@codecov
Copy link

codecov bot commented Jul 5, 2019

Codecov Report

Merging #8991 into master will decrease coverage by 0.05%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #8991      +/-   ##
==========================================
- Coverage   78.68%   78.62%   -0.06%     
==========================================
  Files         388      388              
  Lines      119958   119958              
==========================================
- Hits        94390    94319      -71     
- Misses      25568    25639      +71
Flag Coverage Δ
#kernel 79.42% <ø> (-0.03%) ⬇️
#user 66.11% <ø> (-0.41%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 6dbca94...67af199. Read the comment docs.

@loli10K loli10K added the Status: Code Review Needed Ready for review and testing label Jul 5, 2019
@loli10K loli10K marked this pull request as ready for review July 5, 2019 18:32
Copy link
Contributor

@behlendorf behlendorf left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@behlendorf behlendorf requested review from tonyhutter and ofaaland July 5, 2019 23:51
Copy link
Contributor

@ofaaland ofaaland left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. Thanks for the fix.

@behlendorf behlendorf merged commit a54f92b into openzfs:master Jul 9, 2019
@behlendorf behlendorf added Status: Accepted Ready to integrate (reviewed, tested) and removed Status: Code Review Needed Ready for review and testing labels Jul 9, 2019
TulsiJain pushed a commit to TulsiJain/zfs that referenced this pull request Jul 20, 2019
This commit ensures make(1) targets that build .deb packages fail if
alien(1) can't convert all .rpm files; additionally it also updates
the zfs-dracut package name which was changed to "noarch" in ca4e5a7.

Reviewed-by: Neal Gompa <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Reviewed-by: Olaf Faaland <[email protected]>
Signed-off-by: loli10K <[email protected]>
Closes openzfs#8990 
Closes openzfs#8991
TulsiJain pushed a commit to TulsiJain/zfs that referenced this pull request Jul 20, 2019
This commit ensures make(1) targets that build .deb packages fail if
alien(1) can't convert all .rpm files; additionally it also updates
the zfs-dracut package name which was changed to "noarch" in ca4e5a7.

Reviewed-by: Neal Gompa <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Reviewed-by: Olaf Faaland <[email protected]>
Signed-off-by: loli10K <[email protected]>
Closes openzfs#8990 
Closes openzfs#8991
tonyhutter pushed a commit to tonyhutter/zfs that referenced this pull request Aug 13, 2019
This commit ensures make(1) targets that build .deb packages fail if
alien(1) can't convert all .rpm files; additionally it also updates
the zfs-dracut package name which was changed to "noarch" in ca4e5a7.

Reviewed-by: Neal Gompa <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Reviewed-by: Olaf Faaland <[email protected]>
Signed-off-by: loli10K <[email protected]>
Closes openzfs#8990
Closes openzfs#8991
tonyhutter pushed a commit to tonyhutter/zfs that referenced this pull request Aug 22, 2019
This commit ensures make(1) targets that build .deb packages fail if
alien(1) can't convert all .rpm files; additionally it also updates
the zfs-dracut package name which was changed to "noarch" in ca4e5a7.

Reviewed-by: Neal Gompa <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Reviewed-by: Olaf Faaland <[email protected]>
Signed-off-by: loli10K <[email protected]>
Closes openzfs#8990
Closes openzfs#8991
tonyhutter pushed a commit to tonyhutter/zfs that referenced this pull request Aug 23, 2019
This commit ensures make(1) targets that build .deb packages fail if
alien(1) can't convert all .rpm files; additionally it also updates
the zfs-dracut package name which was changed to "noarch" in ca4e5a7.

Reviewed-by: Neal Gompa <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Reviewed-by: Olaf Faaland <[email protected]>
Signed-off-by: loli10K <[email protected]>
Closes openzfs#8990
Closes openzfs#8991
tonyhutter pushed a commit to tonyhutter/zfs that referenced this pull request Sep 17, 2019
This commit ensures make(1) targets that build .deb packages fail if
alien(1) can't convert all .rpm files; additionally it also updates
the zfs-dracut package name which was changed to "noarch" in ca4e5a7.

Reviewed-by: Neal Gompa <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Reviewed-by: Olaf Faaland <[email protected]>
Signed-off-by: loli10K <[email protected]>
Closes openzfs#8990
Closes openzfs#8991
tonyhutter pushed a commit to tonyhutter/zfs that referenced this pull request Sep 18, 2019
This commit ensures make(1) targets that build .deb packages fail if
alien(1) can't convert all .rpm files; additionally it also updates
the zfs-dracut package name which was changed to "noarch" in ca4e5a7.

Reviewed-by: Neal Gompa <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Reviewed-by: Olaf Faaland <[email protected]>
Signed-off-by: loli10K <[email protected]>
Closes openzfs#8990
Closes openzfs#8991
tonyhutter pushed a commit that referenced this pull request Sep 26, 2019
This commit ensures make(1) targets that build .deb packages fail if
alien(1) can't convert all .rpm files; additionally it also updates
the zfs-dracut package name which was changed to "noarch" in ca4e5a7.

Reviewed-by: Neal Gompa <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Reviewed-by: Olaf Faaland <[email protected]>
Signed-off-by: loli10K <[email protected]>
Closes #8990
Closes #8991
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Component: Packaging custom packages Status: Accepted Ready to integrate (reviewed, tested)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

make deb File "zfs-dracut-0.8.0-111_g6dbca94f0.x86_64.rpm" not found
4 participants