---------- Forwarded message --------- From: Seamus de Mora <[email protected]> Date: Mon, May 2, 2022 at 5:10 AM Subject: Re: [git-buildpackage] A basic question to begin To: Guido Günther <[email protected]>
On Mon, May 2, 2022 at 2:22 AM Guido Günther <[email protected]> wrote: > Hi, > > As Raspian is based on Debian did you try to contribute your patch to > Debian? According to > > https://packages.qa.debian.org/d/dhcpcd5.html > > The current git repo for that packaging is at > > https://salsa.debian.org/smlx-guest/dhcpcd5 > > I submitted it here <https://salsa.debian.org/seamusdemora/dhcpcd5/-/commit/a992b9daf156c40b3d2e8e4e314b8a028aa03778>, but it's not been acted upon. I should also say that I may have screwed this up! I wanted the 'commit request' to be applied against the 'dhcpcd version 8.1.2', but instead it went against 'sid'. It gets very confusing here (to me at least) because as I learned, ver 8.1.2 is not actually in the Debian repo. Someone in the RPi organization told me that they had decided to use a different version, but provided no explanation. Perhaps because the repo in 'salsa' is not being maintained by anyone? I don't know - that's a guess. But what I do know is that RPi has been using 8.1.2 since 25 Oct 2019 according to the 'changelog'. However, that date doesn't quite track with the release date for 8.1.2 posted on the upstream repo <https://roy.marples.name/archives/dhcpcd-discuss/0002678.html>. Don't know if that's relevant or not, but mention it just in case. Further confusing (again - to me) when the '.dsc' file is reviewed as it references the 'salsa' repo which does not contain the 8.1.2 version. I've attached it here FYI. > Can you post how you invoke the command and the full error message? I may have covered my tracks when I began thrashing about trying to address the error messages. I'll 'rm' the directory that was created, and start over - so you won't "miss anything". lol :) First - here are the files & folders created after I installed the RPi source package via '*apt-get source dhcpcd5*' : *drwxr-xr-x 9 pi pi 4096 Apr 27 06:40 dhcpcd5-8.1.2-rw-r--r-- 1 pi pi 12216 Jan 17 08:29 dhcpcd5_8.1.2-1+rpt5.debian.tar.xz-rw-r--r-- 1 pi pi 1075 Jan 17 08:29 dhcpcd5_8.1.2-1+rpt5.dsc-rw-r--r-- 1 pi pi 228736 Nov 18 2019 dhcpcd5_8.1.2.orig.tar.xz * Starting "from scratch" after '*rm -rf dhcpcd5*': *pi@raspberrypi3b:~ $ gbp import-dsc dhcpcd5_8.1.2-1+rpt5.dscgbp:info: No git repository found, creating one.gbp:error: Git command failed: Error running git branch: fatal: A branch named 'master' already exists.* Eventually concluded this error was a red herring (?), and tried this: *pi@raspberrypi3b:~ $ cd dhcpcd5pi@raspberrypi3b:~/dhcpcd5 $ gbp import-dsc ../dhcpcd5_8.1.2-1+rpt5.dscgbp:error:Repository does not have branch 'upstream' for upstream sources. If there is none seefile:///usr/share/doc/git-buildpackage/manual-html/gbp.import.html#GBP.IMPORT.CONVERTon howto create it otherwise use --upstream-branch to specify it.Also check the --create-missing-branches option.* This is where I wondered if the .dsc file was creating an issue. Seems to me the correct upstream sources are only available from this tarball <https://roy.marples.name/downloads/dhcpcd/dhcpcd-8.1.2.tar.xz>. There is a ver 8 branch <https://github.com/NetworkConfiguration/dhcpcd/tree/dhcpcd-8> in Roy's repo, but '8.1.2' is only a tag. In any case, I felt I was spinning my wheels, as it was not clear to me that I'd done anything correctly so far, and had no clear ideas on resolving the missing upstream error. This is the point I reached out for help. > > yes, I hope we can help, > -- Guido I hope so, too! ~S
dhcpcd5_8.1.2-1+rpt5.dsc
Description: Binary data
_______________________________________________ git-buildpackage mailing list [email protected] http://lists.sigxcpu.org/mailman/listinfo/git-buildpackage
