vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

* autogen.sh: Do not try to delete nonexistant files.

Browse source 
* util/import_gcrypth.sed: Add some missing header removals.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2013-01-12 16:14:09 +01:00
parent 01323d49bf
commit 4d7219f90b
3 changed files with 22 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2013-01-11 Vladimir Serbinenko <phcoder@gmail.com>
* autogen.sh: Do not try to delete nonexistant files.
* util/import_gcrypth.sed: Add some missing header removals.
2013-01-12 Colin Watson <cjwatson@ubuntu.com> 2013-01-12 Colin Watson <cjwatson@ubuntu.com>
Clean up dangling references to grub-setup. Clean up dangling references to grub-setup.

12
autogen.sh
View file

@ -14,13 +14,19 @@ python util/import_unicode.py unicode/UnicodeData.txt unicode/BidiMirroring.txt
echo "Importing libgcrypt..." echo "Importing libgcrypt..."
python util/import_gcry.py grub-core/lib/libgcrypt/ grub-core python util/import_gcry.py grub-core/lib/libgcrypt/ grub-core
sed -n -f util/import_gcrypth.sed < grub-core/lib/libgcrypt/src/gcrypt.h.in > include/grub/gcrypt/gcrypt.h sed -n -f util/import_gcrypth.sed < grub-core/lib/libgcrypt/src/gcrypt.h.in > include/grub/gcrypt/gcrypt.h
rm include/grub/gcrypt/g10lib.h if [ -f include/grub/gcrypt/g10lib.h ]; then
rm -rf grub-core/lib/libgcrypt-grub/mpi/generic rm include/grub/gcrypt/g10lib.h
fi
if [ -d grub-core/lib/libgcrypt-grub/mpi/generic ]; then
rm -rf grub-core/lib/libgcrypt-grub/mpi/generic
fi
ln -s ../../../grub-core/lib/libgcrypt-grub/src/g10lib.h include/grub/gcrypt/g10lib.h ln -s ../../../grub-core/lib/libgcrypt-grub/src/g10lib.h include/grub/gcrypt/g10lib.h
cp -R grub-core/lib/libgcrypt/mpi/generic grub-core/lib/libgcrypt-grub/mpi/generic cp -R grub-core/lib/libgcrypt/mpi/generic grub-core/lib/libgcrypt-grub/mpi/generic
for x in mpi-asm-defs.h mpih-add1.c mpih-sub1.c mpih-mul1.c mpih-mul2.c mpih-mul3.c mpih-lshift.c mpih-rshift.c; do for x in mpi-asm-defs.h mpih-add1.c mpih-sub1.c mpih-mul1.c mpih-mul2.c mpih-mul3.c mpih-lshift.c mpih-rshift.c; do
rm grub-core/lib/libgcrypt-grub/mpi/"$x" if [ -f grub-core/lib/libgcrypt-grub/mpi/"$x" ]; then
rm grub-core/lib/libgcrypt-grub/mpi/"$x"
fi
ln -s generic/"$x" grub-core/lib/libgcrypt-grub/mpi/"$x" ln -s generic/"$x" grub-core/lib/libgcrypt-grub/mpi/"$x"
done done

11
util/import_gcrypth.sed
View file

@ -1,7 +1,12 @@
/^#@INSERT_SYS_SELECT_H@/ d /^#@INSERT_SYS_SELECT_H@/ d
/^@FALLBACK_SOCKLEN_T@/ d /^@FALLBACK_SOCKLEN_T@/ d
/^#include <stdlib\.h>/ d /^# *include <stdlib\.h>/ d
/^#include <string\.h>/ d /^# *include <string\.h>/ d
/^#include <gpg-error\.h>/ s,#include <gpg-error.h>,#include <grub/gcrypt/gpg-error.h>, /^# *include <winsock2\.h>/ d
/^# *include <ws2tcpip\.h>/ d
/^# *include <time\.h>/ d
/^# *include <sys\/socket\.h>/ d
/^# *include <sys\/time\.h>/ d
/^# *include <gpg-error\.h>/ s,#include <gpg-error.h>,#include <grub/gcrypt/gpg-error.h>,
s,_gcry_mpi_invm,gcry_mpi_invm,g s,_gcry_mpi_invm,gcry_mpi_invm,g
p p