Hello Helmut Grohne! On Wed, Jun 17, 2015 at 11:00:42PM +0200, Helmut Grohne wrote: > Hi Andreas, > > as promised, I am sending you an updated patch to add a stage1 profile > without systemd to util-linux. This patch is used for the rebootstrap > jobs on jenkins.d.n and works there.
Thanks! > > Two things changed since my last posting: > * Uses current build profile syntax. > * Install fstrim example units even when building without systemd. I've got some questions about the second item .... see inline below. > > Please consider applying the patch now that the archive accepts it. The > packages gem2deb and nss also use profiles already. Forgot to ask when we spoke earlier, but one last blocker for me personally would be if there are (still?) problems with building a profiled package with pbuilder.... I need to be able to build the package (without using any profile) myself after all. ;) Do you know the status of build profiles in pbuilder? [...] > @@ -58,6 +58,12 @@ > > override_dh_auto_install: > dh_auto_install > +ifneq ($(filter stage1,$(DEB_BUILD_PROFILES)),) > + # dh-exec as used in util-linux.install does not support profiles (Not sure how/if this comment is relevant. If needed algernon will likely happily add features to dh-exec. Also couldn't simply environment variable expansion be used? A comment above this entire block explaining what the purpose is would be useful though...) > + install -d debian/tmp/lib/systemd/system > + install -m644 sys-utils/fstrim.service.in > debian/tmp/lib/systemd/system/fstrim.service I doubt this will work as intended. The *.in files are mangled, not just renamed and installed. You'll likely want to use something like this to produce the sys-utils/fstrim.service before installing it: make PATHFILES=sys-utils/fstrim.service sys-utils/fstrim.service That should make sure @sbindir@ gets replaced with /sbin ... (For me personally I wouldn't mind to simplify this into just not shipping the systemd service examples when building as stage1 profile, but I guess you want the packages to be 100% equivalent when build with or without profiles. Even if that is the goal, I'd personally feel safer if the package was fully rebuilt without profiles after the bootstrapping is done just in case. I've been bitten by lingering bootstrapping-altered packages before.) > + install -m644 sys-utils/fstrim.timer > debian/tmp/lib/systemd/system/fstrim.timer > +endif > # > # the version in bsdmainutils seems newer. > rm -f debian/tmp/usr/bin/look debian/tmp/usr/share/man/man1/look.1 > @@ -117,7 +121,9 @@ > dh_installman --language=C > > override_dh_gencontrol: > +ifeq ($(filter stage1,$(DEB_BUILD_PROFILES)),) > dh_gencontrol --package=bsdutils -- -v1:$(DEB_VERSION_UPSTREAM_REVISION) > +endif > dh_gencontrol --remaining-packages > > override_dh_installinit: Regards, Andreas Henriksson -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
