❦ 11 décembre 2020 20:36 -05, Mark Pearson: >> They seem to say future releases will be tagged. So, I think you should >> use in gbp.conf: >> >> upstream-tag = v%(version%~%-)s >> pristine-tar = False >> >> No need for upstream-branch since you won't use "gbp import-orig" as the >> origin lives directly in git repository. >> > Got it - I've made these changes and pushed them to the repository
You need to use "~rc" instead of "-rc", otherwise, users won't be able to upgrade to "1.6" when they have "1.6-rc3" installed. #v+ diff --git a/debian/changelog b/debian/changelog index 1b404ac5e2e6..a5a29a905188 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -firmware-sof (1.6-rc3-1) UNRELEASED; urgency=medium +firmware-sof (1.6~rc3-1) UNRELEASED; urgency=medium * Initial release. (Closes: #960788) diff --git a/debian/gbp.conf b/debian/gbp.conf index 12bd6acf629c..ac06bdd3b375 100644 --- a/debian/gbp.conf +++ b/debian/gbp.conf @@ -1,5 +1,5 @@ [DEFAULT] debian-branch = debian/latest -upstream-tag = v%(version%-%-)s +upstream-tag = v%(version%~%-)s pristine-tar = False #v- > What do I need to do going forward to look after this? Is there anything > in particular that is needed as new sof firmware is released? Just > wanting to check what expectations are going forward and if there is > anything I should be looking out for etc. We wait until monday and then we can upload. When a new firmware is released, you upgrade your repository on Salsa, ping me, I'll review and upload. At some point, you may want to become a DM (Debian Maintainer) to do upload of known packages yourself. >> Also, did you test the package on real hardware or do you need me to >> test it? I can test it, I just need to spend 10 minutes doing it. > Tested on my X1Carbon7 and it works well. I have a bunch of other > platforms I can try it on too if that helps but it will have to be next > week. No need, I'll test it on mine during the week-end. -- It is often the case that the man who can't tell a lie thinks he is the best judge of one. -- Mark Twain, "Pudd'nhead Wilson's Calendar"