On Mon, Dec 21, 2020 at 9:04 PM James Cameron <qu...@laptop.org> wrote:
> I don't believe it, because telepathy-salut-0.8.1.tar.gz does contain > lib/ext/wocky, and it is a directory which contains files. There's no > reason why a git submodule should affect the tar.gz in that way. > telepathy-salut-0.8.1.tar.gz does contain lib/ext/wocky as a directory with files in it and it has the github repo <https://github.com/TelepathyIM/telepathy-salut> as it's upstream and that doesn't contain lib/ext/wocky as a directory but as a wocky submodule. I don't see a reason why the git submodule is affecting it at the moment > > It seems more likely the patch is in error. How can I see the patch? > https://src.fedoraproject.org/ didn't seem to have it. > Yeah I haven't created an PRs as I'm trying to get it to build locally first, you can find the patch here <https://paste.centos.org/view/191e4487> . The commit upstream shows that there was a change but the change was to a submodule, the source files from telepathyfreedesktop.org contains lib/ext/wocky but the source on github doesn't and that explains the error from build.log > You may place temporary shell commands for diagnosis in the %prep > section before the %patch1. Such as ls(1) or file(1). This will give > you output in the build log that you can use to diagnose further. > I used rpmbuild to build just the %prep section and ls shows there files in lib/ext/wocky but still throws same error when applying the patch and I don't get why right now but I think it's because the patch is pointing to a submodule commit. > You should also consider building by hand using rpmbuild, as that will > speed up your iterations for solving the problem. Once you have it > solved, go back to using the Fedora infrastructure to build. > > On Mon, Dec 21, 2020 at 04:50:39PM +0100, Chihurumnaya Ibiam wrote: > > This isn't a problem on my path as I'm not trying to build > telepathy-salut from > > the source code so I didn't clone telepathy-salut, > > building telepathy-salut locally and on koji doesn't work because of > what I > > stated above, I should've included the error > > I got from the build log earlier; > > > > Patch #1 (update-wocky-to-fix-openssl1.1-build-issue.patch): > > + echo 'Patch #1 (update-wocky-to-fix-openssl1.1-build-issue.patch):' > > + /usr/bin/patch --no-backup-if-mismatch -p1 --fuzz=0 > > File lib/ext/wocky is not a regular file -- refusing to patch > > > > You can find the full build log [1]here. > > > > The error seems to happen because in the source code, [2]lib/ext/wocky > is pointing to a particular commit in the wocky submodule, > > > > hence the patch failing as that's not a regular file. > > > > -- > > > > Ibiam Chihurumnaya > > [3]ibiamchihurumn...@gmail.com > > > > On Sat, Dec 19, 2020 at 12:43 AM James Cameron <[4]qu...@laptop.org> > wrote: > > > > On Thu, Dec 17, 2020 at 12:52:11PM +0100, Chihurumnaya Ibiam wrote: > > > Hi Everyone, > > > > > > I'm currently working on fixing telepathy-salut to use openssl 1.0 > > > which has been fixed upstream in this [1]commit but the problem is, > > > lib/ext/wocky points to a particular commit in the wocky submodule > > > of TelepathyIM hence the patch fails as it isn't a regular file, > > > it's supposed to be a directory but in this case it's empty as it's > > > pointing to a particular commit. > > > > When the wocky directory is empty, that suggests the submodule has > not > > been checked out. > > > > > What are the possible ways to fix this? > > > > When cloning, use --recurse-submodules. Or, use `git submodule > update > > --init --recursive` after cloning. > > > > Should you be preparing a patch for packaging, you can also work > > around such git problems by using a recursive diff between two clones > > of wocky. You may need to tweak the diffs with sed. > > > > -- > > James Cameron > > [5]http://quozl.netrek.org/ > > > > References: > > > > [1] > https://kojipkgs.fedoraproject.org//work/tasks/1714/57311714/build.log > > [2] > https://github.com/TelepathyIM/wocky/tree/64062d2f0119b89d15e7bb0e0f6fa54ec23ff7f8 > > [3] mailto:ibiamchihurumn...@gmail.com > > [4] mailto:qu...@laptop.org > > [5] http://quozl.netrek.org/ > > -- > James Cameron > https://quozl.linux.org.au/ -- Ibiam Chihurumnaya ibiamchihurumn...@gmail.com
_______________________________________________ SoaS mailing list SoaS@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/soas