Still unable to build from tardist due to libgcrypt (and probably more) POTFILES

Still unable to build from tardist due to libgcrypt (and probably more) POTFILES

[Andrey Borzenkov]

I do not quite understand how po/POTFILES are maintained but they refer
to files that are not distributed, so rebuild later fails.

[  270s] TARGET_OBJ2ELF= sh genmod.sh moddep.lst gcry_whirlpool.module gcry_whirlpool.mod
[  270s] make[3]: Leaving directory `/home/abuild/rpmbuild/BUILD/grub-2.00/build-efi/grub-core'
[  270s] make[2]: Leaving directory `/home/abuild/rpmbuild/BUILD/grub-2.00/build-efi/grub-core'
[  270s] Making all in po
[  270s] make[2]: Entering directory `/home/abuild/rpmbuild/BUILD/grub-2.00/build-efi/po'
[  270s] make grub2.pot-update
[  270s] make[3]: Entering directory `/home/abuild/rpmbuild/BUILD/grub-2.00/build-efi/po'
[  270s] make[3]: *** No rule to make target `../.././grub-core/lib/libgcrypt/mpi/ec.c', needed by `grub2.pot-update'.  Stop.
[  270s] make[3]: Leaving directory `/home/abuild/rpmbuild/BUILD/grub-2.00/build-efi/po'
[  270s] make[2]: *** [../../po/grub2.pot] Error 2
[  270s] make[2]: Leaving directory `/home/abuild/rpmbuild/BUILD/grub-2.00/build-efi/po'
[  270s] make[1]: *** [all-recursive] Error 1
[  270s] make[1]: Leaving directory `/home/abuild/rpmbuild/BUILD/grub-2.00/build-efi'
[  270s] make: *** [all] Error 2
[  270s] error: Bad exit status from /var/tmp/rpm-tmp.ZuTsTJ (%build)


It is not just one or two files which is why I do not know how to fix
it. Here is full list of files that are present in POTFILES but missing
in tarball:

grub-core/lib/libgcrypt/mpi/ec.c
grub-core/lib/libgcrypt/mpi/generic/mpih-add1.c
grub-core/lib/libgcrypt/mpi/generic/mpih-lshift.c
grub-core/lib/libgcrypt/mpi/generic/mpih-mul1.c
grub-core/lib/libgcrypt/mpi/generic/mpih-mul2.c
grub-core/lib/libgcrypt/mpi/generic/mpih-mul3.c
grub-core/lib/libgcrypt/mpi/generic/mpih-rshift.c
grub-core/lib/libgcrypt/mpi/generic/mpih-sub1.c
grub-core/lib/libgcrypt/mpi/generic/udiv-w-sdiv.c
grub-core/lib/libgcrypt/mpi/mpi-add.c
grub-core/lib/libgcrypt/mpi/mpi-bit.c
grub-core/lib/libgcrypt/mpi/mpi-cmp.c
grub-core/lib/libgcrypt/mpi/mpicoder.c
grub-core/lib/libgcrypt/mpi/mpi-div.c
grub-core/lib/libgcrypt/mpi/mpi-gcd.c
grub-core/lib/libgcrypt/mpi/mpih-div.c
grub-core/lib/libgcrypt/mpi/mpih-mul.c
grub-core/lib/libgcrypt/mpi/mpi-inline.c
grub-core/lib/libgcrypt/mpi/mpi-inv.c
grub-core/lib/libgcrypt/mpi/mpi-mod.c
grub-core/lib/libgcrypt/mpi/mpi-mpow.c
grub-core/lib/libgcrypt/mpi/mpi-mul.c
grub-core/lib/libgcrypt/mpi/mpi-pow.c
grub-core/lib/libgcrypt/mpi/mpi-scan.c
grub-core/lib/libgcrypt/mpi/mpiutil.c
grub-core/lib/libgcrypt/src/ath.c
grub-core/lib/libgcrypt/src/dumpsexp.c
grub-core/lib/libgcrypt/src/fips.c
grub-core/lib/libgcrypt/src/gcryptrnd.c
grub-core/lib/libgcrypt/src/getrandom.c
grub-core/lib/libgcrypt/src/global.c
grub-core/lib/libgcrypt/src/hmac256.c
grub-core/lib/libgcrypt/src/hwfeatures.c
grub-core/lib/libgcrypt/src/misc.c
grub-core/lib/libgcrypt/src/missing-string.c
grub-core/lib/libgcrypt/src/module.c
grub-core/lib/libgcrypt/src/secmem.c
grub-core/lib/libgcrypt/src/sexp.c
grub-core/lib/libgcrypt/src/stdmem.c
grub-core/lib/libgcrypt/src/visibility.c
util/spkmodem-recv.c

Re: Still unable to build from tardist due to libgcrypt (and probably more) POTFILES

[Andrey Borzenkov]

В Wed, 17 Apr 2013 21:49:02 +0400
Andrey Borzenkov <arvidjaar@gmail.com> пишет:

> I do not quite understand how po/POTFILES are maintained but they refer
> to files that are not distributed, so rebuild later fails.
> 

OK, I fixed out package to avoid attempt to rebuild pot files.

> It is not just one or two files which is why I do not know how to fix
> it. Here is full list of files that are present in POTFILES but missing
> in tarball:

> util/spkmodem-recv.c

I guess this needs patch below. spkmodem-recv.c is documented in
grub.texi, so it should be available in tarball.

diff --git a/ChangeLog b/ChangeLog
index eb92ae4..c5db731 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-04-18  Andrey Borzenkov <arvidjaar@gmail.com>
+
+	* conf/Makefile.extra-dist: Add util/spkmodem-recv.c, it is required
+	if user wants to use spkmodem output.
+
 2013-04-17  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* util/grub-mkrescue.in: Add GPT for EFI boot.
diff --git a/conf/Makefile.extra-dist b/conf/Makefile.extra-dist
index 2e36500..b21039a 100644
--- a/conf/Makefile.extra-dist
+++ b/conf/Makefile.extra-dist
@@ -38,6 +38,7 @@ EXTRA_DIST += grub-core/lib/LzmaDec.c
 EXTRA_DIST += BUGS
 EXTRA_DIST += util/i386/efi/grub-dumpdevtree
 EXTRA_DIST += util/import_gcrypth.sed
+EXTRA_DIST += util/spkmodem-recv.c
 
 EXTRA_DIST += m4/gnulib-cache.m4
 EXTRA_DIST += m4/glibc2.m4