Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1 | Upstream-Status: Inappropriate |
| 2 | |
| 3 | Subject: [PATCH] grub: fix for automake-1.12 |
| 4 | |
| 5 | automake 1.12 has depricated automatic de-ANSI-fication support |
| 6 | |
| 7 | this patch avoids these kinds of errors: |
| 8 | |
| 9 | | stage1/Makefile.am:2: error: 'pkglibdir' is not a legitimate directory for 'DATA' |
| 10 | | stage2/Makefile.am:35: error: 'pkglibdir' is not a legitimate directory for 'DATA' |
| 11 | | stage2/Makefile.am:46: error: 'pkglibdir' is not a legitimate directory for 'DATA' |
| 12 | | autoreconf: automake failed with exit status: 1 |
| 13 | | ERROR: autoreconf execution failed. |
| 14 | |
| 15 | The upstream status is marked as 'Inappropriate' because this problem is not uncommon, |
| 16 | it has been there for a long time and no change in upstream. |
| 17 | |
| 18 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> |
| 19 | |
| 20 | Index: grub-0.97/stage1/Makefile.am |
| 21 | =================================================================== |
| 22 | --- a/stage1/Makefile.am |
| 23 | +++ b/stage1/Makefile.am |
| 24 | @@ -1,7 +1,7 @@ |
| 25 | -pkglibdir = $(libdir)/$(PACKAGE)/$(host_cpu)-$(host_vendor) |
| 26 | -nodist_pkglib_DATA = stage1 |
| 27 | +pkgdatadir = $(libdir)/$(PACKAGE)/$(host_cpu)-$(host_vendor) |
| 28 | +nodist_pkgdata_DATA = stage1 |
| 29 | |
| 30 | -CLEANFILES = $(nodist_pkglib_DATA) |
| 31 | +CLEANFILES = $(nodist_pkgdata_DATA) |
| 32 | |
| 33 | # We can't use builtins or standard includes. |
| 34 | AM_CCASFLAGS = $(STAGE1_CFLAGS) -fno-builtin -nostdinc |
| 35 | Index: grub-0.97/stage2/Makefile.am |
| 36 | =================================================================== |
| 37 | --- a/stage2/Makefile.am |
| 38 | +++ b/stage2/Makefile.am |
| 39 | @@ -27,12 +27,12 @@ libgrub_a_CFLAGS = $(GRUB_CFLAGS) -I$(top_srcdir)/lib \ |
| 40 | -DUSE_MD5_PASSWORDS=1 -DSUPPORT_SERIAL=1 -DSUPPORT_HERCULES=1 |
| 41 | |
| 42 | # Stage 2 and Stage 1.5's. |
| 43 | -pkglibdir = $(libdir)/$(PACKAGE)/$(host_cpu)-$(host_vendor) |
| 44 | +pkgdatadir = $(libdir)/$(PACKAGE)/$(host_cpu)-$(host_vendor) |
| 45 | |
| 46 | EXTRA_PROGRAMS = nbloader.exec pxeloader.exec diskless.exec |
| 47 | |
| 48 | if DISKLESS_SUPPORT |
| 49 | -pkglib_DATA = stage2 stage2_eltorito e2fs_stage1_5 fat_stage1_5 \ |
| 50 | +pkgdata_DATA = stage2 stage2_eltorito e2fs_stage1_5 fat_stage1_5 \ |
| 51 | ffs_stage1_5 iso9660_stage1_5 jfs_stage1_5 minix_stage1_5 \ |
| 52 | reiserfs_stage1_5 ufs2_stage1_5 vstafs_stage1_5 xfs_stage1_5 \ |
| 53 | nbgrub pxegrub |
| 54 | @@ -43,7 +43,7 @@ noinst_PROGRAMS = pre_stage2.exec start.exec start_eltorito.exec \ |
| 55 | reiserfs_stage1_5.exec ufs2_stage1_5.exec vstafs_stage1_5.exec \ |
| 56 | xfs_stage1_5.exec nbloader.exec pxeloader.exec diskless.exec |
| 57 | else |
| 58 | -pkglib_DATA = stage2 stage2_eltorito e2fs_stage1_5 fat_stage1_5 \ |
| 59 | +pkgdata_DATA = stage2 stage2_eltorito e2fs_stage1_5 fat_stage1_5 \ |
| 60 | ffs_stage1_5 iso9660_stage1_5 jfs_stage1_5 minix_stage1_5 \ |
| 61 | reiserfs_stage1_5 ufs2_stage1_5 vstafs_stage1_5 xfs_stage1_5 |
| 62 | noinst_DATA = pre_stage2 start start_eltorito |
| 63 | @@ -105,7 +105,7 @@ else |
| 64 | BUILT_SOURCES = stage2_size.h |
| 65 | endif |
| 66 | |
| 67 | -CLEANFILES = $(pkglib_DATA) $(noinst_DATA) $(BUILT_SOURCES) |
| 68 | +CLEANFILES = $(pkgdata_DATA) $(noinst_DATA) $(BUILT_SOURCES) |
| 69 | |
| 70 | stage2_size.h: pre_stage2 |
| 71 | -rm -f stage2_size.h |
| 72 | -- |
| 73 | 1.7.9.5 |
| 74 | |