Merge ~bryce/ubuntu/+source/open-vm-tools:mre-lp1998558-jammy into ubuntu/+source/open-vm-tools:ubuntu/jammy-devel

Why did you pick the debian fix for https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1032305 ? Even debian says it's not needed. Do we see that build failure in some Ubuntu release?

Will this introduce a new runtime dependency in our packaging for the stable releases? What about when compared to what is in Lunar already, which does not have this build-dep?

Yep, I hit that failure right away doing the build locally in LXC, and before trying to fix it myself, I searched online and found the Debian bug, and confirmed it fixed the build issue for me.

libtool: link: g++ -fPIC -DPIC -shared -nostdlib /usr/lib/gcc/x86_64-linux-gnu/11/../../../x86_64-linux-gnu/crti.o /usr/lib/gcc/x86_64-linux-gnu/11/crtbeginS.o .libs/libcontainerInfo_la-containerInfo.o .libs/libcontainerInfo_la-containerInfo_docker.o .libs/libcontainerInfo_la-gogo.pb.o .libs/libcontainerInfo_la-mount.pb.o .libs/libcontainerInfo_la-metrics.pb.o .libs/libcontainerInfo_la-descriptor.pb.o .libs/libcontainerInfo_la-task.pb.o .libs/libcontainerInfo_la-tasks.pb.o .libs/libcontainerInfo_la-containers.pb.o .libs/libcontainerInfo_la-tasks.grpc.pb.o .libs/libcontainerInfo_la-containers.grpc.pb.o .libs/libcontainerInfo_la-containerInfo_grpc.o -Wl,--whole-archive ../../../lib/jsmn/.libs/libJsmn.a -Wl,--no-whole-archive -Wl,-rpath -Wl,/home/bryce/pkg/OpenVmTools/mre-lp1998558/open-vm-tools-gu/open-vm-tools/libvmtools/.libs -lcurl -lprotobuf -lgrpc++ -lgpr -labsl_synchronization /home/bryce/pkg/OpenVmTools/mre-lp1998558/open-vm-tools-gu/open-vm-tools/libvmtools/.libs/libvmtools.so -lgobject-2.0 -lglib-2.0 -L/usr/lib/gcc/x86_64-linux-gnu/11 -L/usr/lib/gcc/x86_64-linux-gnu/11/../../../x86_64-linux-gnu -L/usr/lib/gcc/x86_64-linux-gnu/11/../../../../lib -L/lib/x86_64-linux-gnu -L/lib/../lib -L/usr/lib/x86_64-linux-gnu -L/usr/lib/../lib -L/usr/lib/gcc/x86_64-linux-gnu/11/../../.. -lstdc++ -lm -lc -lgcc_s /usr/lib/gcc/x86_64-linux-gnu/11/crtendS.o /usr/lib/gcc/x86_64-linux-gnu/11/../../../x86_64-linux-gnu/crtn.o -g -O2 -flto=auto -flto=auto -fstack-protector-strong -Wl,-z -Wl,defs -Wl,-lc -Wl,--as-needed -Wl,-Bsymbolic-functions -flto=auto -flto=auto -Wl,-z -Wl,relro -Wl,-soname -Wl,libcontainerInfo.so -o .libs/libcontainerInfo.so
/usr/bin/ld: cannot find -labsl_synchronization: No such file or directory
collect2: error: ld returned 1 exit status
make[5]: *** [Makefile:648: libcontainerInfo.la] Error 1
make[5]: Leaving directory '/home/bryce/pkg/OpenVmTools/mre-lp1998558/open-vm-tools-gu/open-vm-tools/services/plugins/containerInfo'
make[4]: *** [Makefile:814: all-recursive] Error 1
make[4]: Leaving directory '/home/bryce/pkg/OpenVmTools/mre-lp1998558/open-vm-tools-gu/open-vm-tools/services/plugins/containerInfo'
make[3]: *** [Makefile:519: all-recursive] Error 1
make[3]: Leaving directory '/home/bryce/pkg/OpenVmTools/mre-lp1998558/open-vm-tools-gu/open-vm-tools/services/plugins'
make[2]: *** [Makefile:502: all-recursive] Error 1
make[2]: Leaving directory '/home/bryce/pkg/OpenVmTools/mre-lp1998558/open-vm-tools-gu/open-vm-tools/services'
make[1]: *** [Makefile:566: all-recursive] Error 1
make[1]: Leaving directory '/home/bryce/pkg/OpenVmTools/mre-lp1998558/open-vm-tools-gu/open-vm-tools'
dh_auto_build: error: cd open-vm-tools && make -j12 returned exit code 2
make: *** [debian/rules:13: build] Error 25
dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2
debuild: fatal error at line 1182:
dpkg-buildpackage -us -uc -ui -i -I.bzr -I.svn -I.git failed
triage-jammy+22.04: ~/pkg/OpenVmTools/mre-lp1998558/open-vm-tools-gu$

...

Interesting that it doesn't ftbfs on lunar.

I was wondering if we were going to need a bug for this FTBFS, but I think not, as it's just the new version that has this issue, and then the change can be bundled together with the SRU bug. I would just ask you to find a place somewhere to link the debian bug, instead (or in addition to) just the commit hash (from salsa).

Instead of

- (Debian commit d266aa73)

in d/changelog, maybe just put in there the debian bug number, like

- (Closes #1032305)

The merge conflict launchpad is reporting in d/changelog, is it because of the backport? I couldn't quite figure it out, I haven't seen conflicts in backports before. Maybe you need to rebase?

Other than that, +1

Approvers: bryce, ahasenack
Uploaders: bryce, ahasenack
MP auto-approved

Added the debian bug. I wasn't sure if it was proper to reference debian bugs from ubuntu changelogs, so used the commit instead, but on reflection I agree that's going to be more communicative for most readers.

Yeah the conflict here is due to the backport, in particular because there was already an earlier (no-change) mre backport, and I forgot to merge its changelog entry in. I've corrected that omission, and will have to remember to do that next time since there's now a change included in the delta.

Thanks for the review, changes incorporated, and uploaded:

Successfully signed dsc, buildinfo, changes files
Vcs-Git: https://git.launchpad.net/~bryce/ubuntu/+source/open-vm-tools
Vcs-Git-Commit: 63d6259a2fab6fedfe3cc20946f5c82c5bb3950a
Vcs-Git-Ref: refs/heads/mre-lp1998558-jammy
$ dput ubuntu ../open-vm-tools_12.1.5-3~ubuntu0.22.04.1_source.changes
gpg: ../open-vm-tools_12.1.5-3~ubuntu0.22.04.1_source.changes: Valid signature from E603B2578FB8F0FB
gpg: ../open-vm-tools_12.1.5-3~ubuntu0.22.04.1.dsc: Valid signature from E603B2578FB8F0FB
D: Setting host argument.
Checking signature on .changes
Checking signature on .dsc
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading open-vm-tools_12.1.5-3~ubuntu0.22.04.1.dsc: done.
  Uploading open-vm-tools_12.1.5-3~ubuntu0.22.04.1.debian.tar.xz: done.
  Uploading open-vm-tools_12.1.5-3~ubuntu0.22.04.1_source.buildinfo: done.
  Uploading open-vm-tools_12.1.5-3~ubuntu0.22.04.1_source.changes: done.
Successfully uploaded packages.