1. Forum
  2. Usenet
  3. LINUX.DEBIAN.DEVEL.MENTOR

  • salsa git workflows - import or mirror or?

    From Gavin Henry@21:1/5 to All on Tue Jan 4 20:30:01 2022
    Hi all,

    I've created https://salsa.debian.org/ghenry/sentrypeer as an import
    from my main GitHub repo.

    If I wanted to follow the pattern of:

    https://salsa.debian.org/pkg-voip-team/libosip2 https://salsa.debian.org/vagrant/librecast (my friends project)

    How best do I start? I note the debian folder is in the repo too,
    where as I have mine as a branch:

    https://github.com/SentryPeer/SentryPeer/tree/debian-packaging

    I can't find the answer in the mentor FAQ or dev guides listed here
    (unless I have missed it):

    https://mentors.debian.net/intro-maintainers/ https://www.debian.org/doc/manuals/developers-reference/resources.en.html#salsa-debian-org-git-repositories-and-collaborative-development-platform
    https://wiki.debian.org/Salsa/Doc

    Thanks,
    Gavin.

    --
    Kind Regards,

    Gavin Henry.
    https://sentrypeer.org

    --- SoupGate-Win32 v1.05
    * Origin: fsxNet Usenet Gateway (21:1/5)
  • From Gavin Henry@21:1/5 to All on Tue Jan 4 21:50:02 2022
    If I wanted to follow the pattern of:

    https://salsa.debian.org/pkg-voip-team/libosip2 https://salsa.debian.org/vagrant/librecast (my friends project)

    Upon further reading, I think this workflow is:

    https://manpages.debian.org/testing/git-buildpackage/gbp-import-orig.1.en.html

    like:

    https://www.kali.org/docs/development/public-packaging/

    --
    Kind Regards,

    Gavin Henry.
    https://sentrypeer.org

    --- SoupGate-Win32 v1.05
    * Origin: fsxNet Usenet Gateway (21:1/5)
  • From Juri Grabowski@21:1/5 to All on Tue Jan 4 22:10:01 2022
    Hello,

    After reading of official documentation
    I have started like this:
    Added DEB_SIGN_KEYID DEBEMAIL DEBFULLNAME to environment variables.
    apt-get install build-essential pkg-config sbuild-debian-developer-setup dput-ng packaging-dev
    Depends on packages, what you want to build:
    apt install dh-acc dh-ada-library dh-apache2 dh-apparmor dh-buildinfo dh-consoledata dh-di dh-dist-zilla dh-elpa dh-exec dh-golang dh-haskell dh-kpatches dh-linktree dh-lisp dh-lua dh-make-drupal dh-make-elpa dh-make-golang dh-make-perl dh-metainit dh-ocaml dh-php dh-r dh-rebar
    dh-runit dh-systemd dh-sysuser dh-virtualenv dh-xsp

    sbuild-debian-developer-setup
    after this I've tried to rebuild one package with

    sbuild -v -d unstable

    To create skeleton for you new package you can take dh_make or debmake
    I decided to take a way with just debian folder in debian/master and debian/$(lsb_release -cs) branches.
    dh_make --help give you a small overview about some options, for small template, it should be enough:
    dh_make -s -c gpl3 -p $PACKAGE_0.0.0.1
    or
    debmake -T -P -L -x3 -f "$DEBFULLNAME" -e "$DEBEMAIL" -p $YOUR_PACKAGENAME -u $PACKAGEVERSION -r 1 -d unstable -n
    to have more templates.

    Add d/watch for your package and try to check new version with
    uscan --dehs
    After changing debian/* files for you needs
    wrap-and-sort -sav
    for d/copyright licensecheck can be helpfull
    enable CI/CD on salsa for debian/salsa.yml
    I use a little bit modified version of salsa.yml: https://salsa.debian.org/gratuxri/check-mk-agent/-/raw/debian/master/debian/salsa-ci.yml?inline=false
    add upstream/metadata with lintian-brush
    add d/gbp.conf with "debian-branch = debian/master" and "overlay = true" in section [DEFAULT] for clean debian branch.
    git commit
    gbp import-orig --uscan
    gbp dch -i
    git commit
    git push

    Sorry, it's just small overview, how I do it.

    Best Regards,
    Juri Grabowski

    --- SoupGate-Win32 v1.05
    * Origin: fsxNet Usenet Gateway (21:1/5)
  • From Gavin Henry@21:1/5 to All on Tue Jan 4 22:40:02 2022
    Sorry, it's just small overview, how I do it.

    Brilliant, thank you Juri! Did you add this to the UpstreamGuide wiki at all?

    --
    Kind Regards,

    Gavin Henry.
    https://sentrypeer.org

    --- SoupGate-Win32 v1.05
    * Origin: fsxNet Usenet Gateway (21:1/5)
  • From Andrey Rahmatullin@21:1/5 to Gavin Henry on Wed Jan 5 10:50:02 2022
    On Tue, Jan 04, 2022 at 09:31:18PM +0000, Gavin Henry wrote:
    Sorry, it's just small overview, how I do it.

    Brilliant, thank you Juri! Did you add this to the UpstreamGuide wiki at all?
    Why would it be useful on that page?

    --
    WBR, wRAR

    -----BEGIN PGP SIGNATURE-----

    iQJhBAABCgBLFiEEolIP6gqGcKZh3YxVM2L3AxpJkuEFAmHVZ5AtFIAAAAAAFQAP cGthLWFkZHJlc3NAZ251cGcub3Jnd3JhckBkZWJpYW4ub3JnAAoJEDNi9wMaSZLh 9wkP+wSIHr8/SqTwu2mS8l3N1KO3k/41/WWyokHdTJ4jCt1twyf69vTQzmB04GFL 62SG7+6otjyqxZ1VEFR3T5Zmfuov3LaqvXwUoWm0213PiGxf0kNBDSD7MhYSJ3Lk 4RouoKRBUUUkb7dKLA9kljzFjuseL1WUb9THpxASCrAhbfmVPwJ+Wf8b0IQ+ZvqJ mawcK4nu9bljEx73WGLZhj1xGp/7g15dBxVPRRQws0+VkUVdm/tytK20MYpVvssu j6VcUsFx8p+b0nDDI6QvxxUWyX/att13QHXUoeoDOn8Hiw0Bv749Oo4MjaCFjXIt eVsXjr/kvEOhC4nHw6Yvl2M65QgseETCCphpMJyITdAW6NgrehldaDWRiA+PVJsr P46MIRakOdZ+Z6dKHb/Mihom8Il8RFWcP0o6Z188mvs/QUe4oDfho3DJbXts2LPZ Asx5EIzYZBaWqAk3/xdFRqRWDTbkRey+8rRqgnUdf60s7m1rF7gTytrG+qKlzwVS MxEFvPEMKE85zihNqZDXsHU09DlK/AA2fDRMCbeAZcKdk+sc25HPLMjYV5CSaCLv KVUJrpbCP4Qi3PaG5ybj/eIeh3ftNjIoJv62D2rSAX5u6zUztH8pQeez48HaHCSl /+8KgF3Eubt64tyImOvSswlYuCBFZD6BxFRwhQebLLhNcmZC
    =dJTI
    -----END PGP SIGNATURE-----

    --- SoupGate-Win32 v1.05
    * Origin: fsxNet Usenet Gateway (21:1/5)
  • From Gavin Henry@21:1/5 to All on Wed Jan 5 12:50:01 2022

    https://salsa.debian.org/pkg-voip-team/libosip2 https://salsa.debian.org/vagrant/librecast (my friends project)
    These use two different workflows.
    libosip2 uses gbp and gbp-import-orig, importing upstream tarballs.
    librecast adds the upstream repo as a remote and merges upstream tags directly. It's not clear if it implies using gbp as there is no gbp.conf
    that would set the correct upstream tag pattern.

    Thanks, that wasn't clear for me.

    How best do I start?
    Thre are many different workflows and you need to choose one. If you
    decide to use gbp you can read https://honk.sigxcpu.org/projects/git-buildpackage/manual-html/gbp.import.upstream-git.html
    for some of the possible ones. I think gbp-import-orig+pristine-tar is the most popular among those.

    That's the one that looks good for me. Thanks for the docs link.

    --
    Kind Regards,

    Gavin Henry.
    https://sentrypeer.org

    --- SoupGate-Win32 v1.05
    * Origin: fsxNet Usenet Gateway (21:1/5)
  • From Andrey Rahmatullin@21:1/5 to Gavin Henry on Wed Jan 5 13:20:01 2022
    On Wed, Jan 05, 2022 at 11:43:21AM +0000, Gavin Henry wrote:
    Brilliant, thank you Juri! Did you add this to the UpstreamGuide wiki at all?
    Why would it be useful on that page?

    For me it was like the difference between reading a computer science
    book and source code. Juri's examples clearly showed the practical
    steps of the workflow.
    I was asking why would it be useful on the UpstreamGuide page which is explicitly for upstreams, not packagers.

    --
    WBR, wRAR

    -----BEGIN PGP SIGNATURE-----

    iQJhBAABCgBLFiEEolIP6gqGcKZh3YxVM2L3AxpJkuEFAmHVjBItFIAAAAAAFQAP cGthLWFkZHJlc3NAZ251cGcub3Jnd3JhckBkZWJpYW4ub3JnAAoJEDNi9wMaSZLh kG0QAKt05c5K8cf/Fw9+QSQ+7SLgr22ARBy1eXgeagfeqm3+Cm2ryuhhBaWYaTO9 uYJ3tnPXWDh8pDUYNj69wO5T2VKY+IZgLmeSJN4ztU9Nm4GA8kOMo+Toa/pIBnxa YLHKXLS2JlLoegWR4mL/s/RletJTsMnSWyL9Lfoeiziz/qJ7jl9uDJgZd0F9/Gr9 nTymOzLfv37Je7h37tbPheRk51/zql381jBNuwqylQvXFaNGA10gxsVJE9mCsmCo L0yPnjxVrxXNES0R5NIoKGlGx9lVPDLEkkMIlp9e6BoIISFJPRG9YEtUp8QujUd2 AY7cqbaMHDyTu38dvD80tcb9r7UkZFfAz5RGtl/+Pfcg1CHvnUWCZsPH97pPYO+u Sm/V2iN1QnZgOAccOB+XoA+73dhrtT+LYwNEHeB/gwLPTMMQMC3N7Ts0tUMy2WWu MohZhiPGAgFmmL1vWKnfwAiGW+gsMXUPT1RmCiVEGVOAN9B7PLOOCdTxVkVlMrsN yHLwMduwG60Nm6cRmC4jdtGQQmpq8yCCntZzYZu8zmdwBdPRE/Iqi59MkCOfg3MY 5p/hu3Rwgc6+886NOjo9ocpOpan0Tm2ALeJ+4mfx3CypGVJ3P2mWILu1gt6Sh2rP V+iQ70+Fn4CNgAFZB5Ar4AJXfYlKBfEOOS1TH+TY8Wl5ZVNg
    =XEMg
    -----END PGP SIGNATURE-----

    --- SoupGate-Win32 v1.05
    * Origin: fsxNet Usenet Gateway (21:1/5)