git checkout upstream/ubuntu/devel
git cherry-pick
aad528672b4a05d43c74fe1a9f8df86df19ff24b
git cherry-pick 2c80c5a0a5e0c2b4b45b85ae1acd9dcd9a7e843b
git reset HEAD~2 # to consolidate both cherry-picks to a single patch
git diff > ../fix-nocloudnet-seedfrom.patch
git checkout .
quilt new cpick-nocloudnet-seedfrom-sysconfig-fix.patch
quilt add cloudinit/sources/DataSourceNoCloud.py
quilt add tests/unittests/sources/test_nocloud.py
git apply ../fix-nocloudnet-seedfrom.patch
quilt refresh
quilt header --dep3 -e
quilt pop -a
git commit -am 'Add d/p/cpick....'
dch -i # manually Add changelog entry and version
git commit -am 'update changelog'
# manually set d/changelog version to oracular for release
git commit -am 'releasing cloud-init version...'
Additonal context
I chose to consolidate the two separate cherry-picks into a single quilt patch to track against the LP bug. This involved manually applying the cherry-picks and consolidating them as a single patch when creating the quilt patch.
The prefix d/p/cpick- is significant as next new_upstream_snapshot we run against ubuntu/devel and debian/patches/cpick-* files are dropped as they are known to be upstream commits already present
Also expectation is the breaks daily build recipe because carrying the cpick file in ubuntu/devel will merge fine against tip of main, but we can't reapply this changeset with quilt push -a as it's already there,
Bug fix release for upload per https://bugs.launchpad.net/ubuntu/+source/cloud-init/+bug/2080688
steps to create this branch
Additonal context
d/p/cpick-is significant as next new_upstream_snapshot we run against ubuntu/devel and debian/patches/cpick-* files are dropped as they are known to be upstream commits already present