From b02c700d6c6c794c1c30acb5a1c51ccfe59e99e8 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 7 Jul 2015 10:17:17 -0400 Subject: [PATCH] Be less terrible with .gitignore We lost a man page because of this bzrignore<->gitignore junk, so solve that slightly better. Signed-off-by: Peter Jones --- .gitignore | 1 - 0001-Make-.gitignore-suck-way-less.patch | 371 +++++++++++++++++++++++ gitignore | 241 +++++++++++++++ grub2.spec | 12 +- sources | 1 - 5 files changed, 622 insertions(+), 4 deletions(-) create mode 100644 0001-Make-.gitignore-suck-way-less.patch create mode 100644 gitignore diff --git a/.gitignore b/.gitignore index 5edb643..273bdef 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,3 @@ grub-*.tar.?z clog /unifont-5.1.20080820.pcf.gz /theme.tar.bz2 -/gitignore diff --git a/0001-Make-.gitignore-suck-way-less.patch b/0001-Make-.gitignore-suck-way-less.patch new file mode 100644 index 0000000..bf3aac7 --- /dev/null +++ b/0001-Make-.gitignore-suck-way-less.patch @@ -0,0 +1,371 @@ +From a41ad147febd85ec9a08c43f3e3db6845fb2cc2e Mon Sep 17 00:00:00 2001 +From: Peter Jones +Date: Wed, 22 Jul 2015 09:14:32 -0400 +Subject: [PATCH] Make .gitignore suck way less + +We lost a man page because of this bzrignore<->gitignore junk, so solve +that slightly better. + +Signed-off-by: Peter Jones +--- + .gitignore | 265 ++++++++++++++++++++++++++++--------------------------------- + 1 file changed, 120 insertions(+), 145 deletions(-) + +diff --git a/.gitignore b/.gitignore +index 18ab8e8..06c9f3a 100644 +--- a/.gitignore ++++ b/.gitignore +@@ -1,93 +1,154 @@ +-00_header +-10_* +-20_linux_xen +-30_os-prober +-40_custom +-41_custom +-*.1 +-*.8 ++!util/*.[[:digit:]] ++!util/grub.d/[[:digit:]][[:digit:]]_*.in ++*.[[:digit:]] ++*.a ++*.exe ++*.exec ++*.image ++*.img ++*.log ++*.lst ++*.marker ++*.mod ++*.o ++*.pf2 ++*.pp ++*.trs ++.deps ++.deps-core ++.deps-util ++.dirstamp ++DISTLIST ++GPATH ++GRTAGS ++GSYMS ++GTAGS ++Makefile ++Makefile.in ++Makefile.util.am ++Makefile.utilgcry.def ++[[:digit:]][[:digit:]]_* + aclocal.m4 + ahci_test + ascii.bitmaps + ascii.h + autom4te.cache ++build-aux/test-driver + build-grub-gen-asciih + build-grub-gen-widthspec + build-grub-mkfont + cdboot_test + cmp_test ++compile ++config-util.h ++config-util.h.in + config.cache + config.guess + config.h +-config-util.h +-config-util.h.in + config.log + config.status + config.sub + configure ++contrib + core_compress_test +-DISTLIST ++depcomp + docs/*.info ++docs/stamp-1 + docs/stamp-vti ++docs/version-dev.texi + docs/version.texi + ehci_test + example_grub_script_test + example_scripted_test + example_unit_test +-*.exec +-*.exec.exe + fddboot_test ++garbage-gen + genkernsyms.sh + gensymlist.sh + gentrigtables +-gentrigtables.exe + gettext_strings_test + grub-bin2h +-/grub-bios-setup +-/grub-bios-setup.exe ++grub-bios-setup ++grub-core/*.module ++grub-core/*.pp ++grub-core/Makefile.core.am ++grub-core/Makefile.gcry.def ++grub-core/bootinfo.txt ++grub-core/contrib ++grub-core/gdb_grub ++grub-core/genmod.sh ++grub-core/gensyminfo.sh ++grub-core/gmodule.pl ++grub-core/gnulib/alloca.h ++grub-core/gnulib/arg-nonnull.h ++grub-core/gnulib/c++defs.h ++grub-core/gnulib/charset.alias ++grub-core/gnulib/configmake.h ++grub-core/gnulib/float.h ++grub-core/gnulib/getopt.h ++grub-core/gnulib/langinfo.h ++grub-core/gnulib/locale.h ++grub-core/gnulib/ref-add.sed ++grub-core/gnulib/ref-del.sed ++grub-core/gnulib/stdio.h ++grub-core/gnulib/stdlib.h ++grub-core/gnulib/string.h ++grub-core/gnulib/strings.h ++grub-core/gnulib/sys ++grub-core/gnulib/unistd.h ++grub-core/gnulib/unitypes.h ++grub-core/gnulib/uniwidth.h ++grub-core/gnulib/warn-on-use.h ++grub-core/gnulib/wchar.h ++grub-core/gnulib/wctype.h ++grub-core/grub.chrp ++grub-core/kernel.img.bin ++grub-core/lib/libgcrypt-grub ++grub-core/modinfo.sh ++grub-core/rs_decoder.h ++grub-editenv ++grub-emu ++grub-emu-lite ++grub-file ++grub-fs-tester ++grub-fstest ++grub-glue-efi ++grub-install ++grub-kbdcomp ++grub-macbless ++grub-macho2img ++grub-menulst2cfg ++grub-mk* ++grub-mount ++grub-ofpathname ++grub-probe ++grub-reboot ++grub-render-label ++grub-script-check ++grub-set-default ++grub-shell ++grub-shell-tester ++grub-sparc64-setup ++grub-syslinux2cfg + grub_cmd_date + grub_cmd_echo + grub_cmd_regexp + grub_cmd_set_date + grub_cmd_sleep +-/grub-editenv +-/grub-editenv.exe +-grub-emu +-grub-emu-lite +-grub-emu.exe +-grub-emu-lite.exe + grub_emu_init.c + grub_emu_init.h +-/grub-file +-/grub-file.exe +-grub-fstest +-grub-fstest.exe + grub_fstest_init.c + grub_fstest_init.h + grub_func_test +-grub-install +-grub-install.exe +-grub-kbdcomp +-/grub-macbless +-/grub-macbless.exe +-grub-macho2img +-/grub-menulst2cfg +-/grub-menulst2cfg.exe +-/grub-mk* +-grub-mount +-/grub-ofpathname +-/grub-ofpathname.exe +-grub-core/build-grub-pe2elf.exe +-/grub-probe +-/grub-probe.exe + grub_probe_init.c + grub_probe_init.h +-/grub-reboot ++grub_script.tab.c ++grub_script.tab.h ++grub_script.yy.c ++grub_script.yy.h + grub_script_blanklines + grub_script_blockarg + grub_script_break +-grub-script-check +-grub-script-check.exe + grub_script_check_init.c + grub_script_check_init.h + grub_script_comments +@@ -113,136 +174,50 @@ grub_script_strcmp + grub_script_test + grub_script_vars1 + grub_script_while1 +-grub_script.tab.c +-grub_script.tab.h +-grub_script.yy.c +-grub_script.yy.h +-grub-set-default + grub_setup_init.c + grub_setup_init.h +-grub-shell +-grub-shell-tester +-grub-sparc64-setup +-grub-sparc64-setup.exe +-/grub-syslinux2cfg +-/grub-syslinux2cfg.exe + gzcompress_test + hddboot_test + help_test +-*.img +-*.image +-*.image.exe + include/grub/cpu ++include/grub/gcrypt/g10lib.h ++include/grub/gcrypt/gcrypt.h + include/grub/machine + install-sh + lib/libgcrypt-grub + libgrub_a_init.c +-*.log +-*.lst + lzocompress_test +-*.marker +-Makefile +-*.mod +-mod-*.c ++mdate-sh + missing ++mod-*.c + netboot_test +-*.o +-*.a + ohci_test + partmap_test + pata_test +-*.pf2 +-*.pp ++po/*.gmo + po/*.mo +-po/grub.pot ++po/*.po ++po/LINGUAS + po/POTFILES ++po/POTFILES-shell.in ++po/POTFILES.in ++po/grub.pot ++po/remove-potcdate.sed + po/stamp-po + printf_test + priority_queue_unit_test + pseries_test + stamp-h +-stamp-h1 + stamp-h.in ++stamp-h1 + symlist.c + symlist.h ++texinfo.tex + trigtables.c +-*.trs + uhci_test +-update-grub_lib + unidata.c +-xzcompress_test +-Makefile.in +-GPATH +-GRTAGS +-GSYMS +-GTAGS +-compile +-depcomp +-mdate-sh +-texinfo.tex +-grub-core/lib/libgcrypt-grub +-.deps +-.deps-util +-.deps-core +-.dirstamp +-Makefile.util.am +-contrib +-grub-core/bootinfo.txt +-grub-core/Makefile.core.am +-grub-core/Makefile.gcry.def +-grub-core/contrib +-grub-core/gdb_grub +-grub-core/genmod.sh +-grub-core/gensyminfo.sh +-grub-core/gmodule.pl +-grub-core/grub.chrp +-grub-core/modinfo.sh +-grub-core/*.module +-grub-core/*.module.exe +-grub-core/*.pp +-grub-core/kernel.img.bin ++update-grub_lib + util/bash-completion.d/grub +-grub-core/gnulib/alloca.h +-grub-core/gnulib/arg-nonnull.h +-grub-core/gnulib/c++defs.h +-grub-core/gnulib/charset.alias +-grub-core/gnulib/configmake.h +-grub-core/gnulib/float.h +-grub-core/gnulib/getopt.h +-grub-core/gnulib/langinfo.h +-grub-core/gnulib/ref-add.sed +-grub-core/gnulib/ref-del.sed +-grub-core/gnulib/stdio.h +-grub-core/gnulib/stdlib.h +-grub-core/gnulib/string.h +-grub-core/gnulib/strings.h +-grub-core/gnulib/sys +-grub-core/gnulib/unistd.h +-grub-core/gnulib/warn-on-use.h +-grub-core/gnulib/wchar.h +-grub-core/gnulib/wctype.h +-grub-core/rs_decoder.h + widthspec.bin + widthspec.h +-docs/stamp-1 +-docs/version-dev.texi +-Makefile.utilgcry.def +-po/*.po +-po/*.gmo +-po/LINGUAS +-po/remove-potcdate.sed +-include/grub/gcrypt/gcrypt.h +-include/grub/gcrypt/g10lib.h +-po/POTFILES.in +-po/POTFILES-shell.in +-/grub-glue-efi +-/grub-render-label +-/grub-glue-efi.exe +-/grub-render-label.exe +-grub-core/gnulib/locale.h +-grub-core/gnulib/unitypes.h +-grub-core/gnulib/uniwidth.h +-build-aux/test-driver +-/garbage-gen +-/garbage-gen.exe +-/grub-fs-tester ++xzcompress_test +-- +2.4.3 + diff --git a/gitignore b/gitignore new file mode 100644 index 0000000..2b0156a --- /dev/null +++ b/gitignore @@ -0,0 +1,241 @@ +00_header +10_* +20_linux_xen +30_os-prober +40_custom +41_custom +*.1 +*.8 +aclocal.m4 +ahci_test +ascii.bitmaps +ascii.h +autom4te.cache +build-grub-gen-asciih +build-grub-gen-widthspec +build-grub-mkfont +cdboot_test +cmp_test +config.cache +config.guess +config.h +config-util.h +config-util.h.in +config.log +config.status +config.sub +configure +core_compress_test +DISTLIST +docs/*.info +docs/stamp-vti +docs/version.texi +ehci_test +example_grub_script_test +example_scripted_test +example_unit_test +*.exec +*.exec.exe +fddboot_test +genkernsyms.sh +gensymlist.sh +gentrigtables +gentrigtables.exe +gettext_strings_test +grub-bin2h +/grub-bios-setup +/grub-bios-setup.exe +grub_cmd_date +grub_cmd_echo +grub_cmd_regexp +grub_cmd_set_date +grub_cmd_sleep +/grub-editenv +/grub-editenv.exe +grub-emu +grub-emu-lite +grub-emu.exe +grub-emu-lite.exe +grub_emu_init.c +grub_emu_init.h +grub-fstest +grub-fstest.exe +grub_fstest_init.c +grub_fstest_init.h +grub_func_test +grub-install +grub-install.exe +grub-kbdcomp +grub-macho2img +/grub-menulst2cfg +/grub-menulst2cfg.exe +/grub-mk* +grub-mount +/grub-ofpathname +/grub-ofpathname.exe +grub-core/build-grub-pe2elf.exe +/grub-probe +/grub-probe.exe +grub_probe_init.c +grub_probe_init.h +/grub-reboot +grub_script_blanklines +grub_script_blockarg +grub_script_break +grub-script-check +grub-script-check.exe +grub_script_check_init.c +grub_script_check_init.h +grub_script_comments +grub_script_continue +grub_script_dollar +grub_script_echo1 +grub_script_echo_keywords +grub_script_escape_comma +grub_script_eval +grub_script_expansion +grub_script_final_semicolon +grub_script_for1 +grub_script_functions +grub_script_gettext +grub_script_if +grub_script_leading_whitespace +grub_script_no_commands +grub_script_not +grub_script_return +grub_script_setparams +grub_script_shift +grub_script_strcmp +grub_script_test +grub_script_vars1 +grub_script_while1 +grub_script.tab.c +grub_script.tab.h +grub_script.yy.c +grub_script.yy.h +grub-set-default +grub_setup_init.c +grub_setup_init.h +grub-shell +grub-shell-tester +grub-sparc64-setup +grub-sparc64-setup.exe +gzcompress_test +hddboot_test +help_test +*.img +*.image +*.image.exe +include/grub/cpu +include/grub/machine +install-sh +lib/libgcrypt-grub +libgrub_a_init.c +*.log +*.lst +lzocompress_test +*.marker +Makefile +*.mod +mod-*.c +missing +netboot_test +*.o +*.a +ohci_test +partmap_test +pata_test +*.pf2 +*.pp +po/*.mo +po/grub.pot +po/POTFILES +po/stamp-po +printf_test +priority_queue_unit_test +pseries_test +stamp-h +stamp-h1 +stamp-h.in +symlist.c +symlist.h +trigtables.c +*.trs +uhci_test +update-grub_lib +unidata.c +xzcompress_test +Makefile.in +GPATH +GRTAGS +GSYMS +GTAGS +compile +depcomp +mdate-sh +texinfo.tex +grub-core/lib/libgcrypt-grub +.deps +.deps-util +.deps-core +.dirstamp +Makefile.util.am +contrib +grub-core/bootinfo.txt +grub-core/Makefile.core.am +grub-core/Makefile.gcry.def +grub-core/contrib +grub-core/gdb_grub +grub-core/genmod.sh +grub-core/gensyminfo.sh +grub-core/gmodule.pl +grub-core/grub.chrp +grub-core/modinfo.sh +grub-core/*.module +grub-core/*.module.exe +grub-core/*.pp +util/bash-completion.d/grub +grub-core/gnulib/alloca.h +grub-core/gnulib/arg-nonnull.h +grub-core/gnulib/c++defs.h +grub-core/gnulib/charset.alias +grub-core/gnulib/configmake.h +grub-core/gnulib/float.h +grub-core/gnulib/getopt.h +grub-core/gnulib/langinfo.h +grub-core/gnulib/ref-add.sed +grub-core/gnulib/ref-del.sed +grub-core/gnulib/stdio.h +grub-core/gnulib/stdlib.h +grub-core/gnulib/string.h +grub-core/gnulib/strings.h +grub-core/gnulib/sys +grub-core/gnulib/unistd.h +grub-core/gnulib/warn-on-use.h +grub-core/gnulib/wchar.h +grub-core/gnulib/wctype.h +grub-core/rs_decoder.h +widthspec.bin +widthspec.h +docs/stamp-1 +docs/version-dev.texi +Makefile.utilgcry.def +po/*.po +po/*.gmo +po/LINGUAS +po/remove-potcdate.sed +include/grub/gcrypt/gcrypt.h +include/grub/gcrypt/g10lib.h +po/POTFILES.in +po/POTFILES-shell.in +/grub-glue-efi +/grub-render-label +/grub-glue-efi.exe +/grub-render-label.exe +grub-core/gnulib/locale.h +grub-core/gnulib/unitypes.h +grub-core/gnulib/uniwidth.h +build-aux/test-driver +/garbage-gen +/garbage-gen.exe +/grub-fs-tester diff --git a/grub2.spec b/grub2.spec index 0bb59a9..8fb4f27 100644 --- a/grub2.spec +++ b/grub2.spec @@ -215,6 +215,7 @@ Patch0154: 0154-Try-to-emit-linux16-initrd16-and-linuxefi-initrdefi-.patch Patch0155: 0001-Update-to-minilzo-2.08.patch Patch0156: 0001-Make-grub2-mkconfig-construct-titles-that-look-like-.patch Patch0157: 0002-Make-rescue-and-debug-entries-sort-right-again-in-gr.patch +Patch0158: 0001-Make-.gitignore-suck-way-less.patch BuildRequires: flex bison binutils python BuildRequires: ncurses-devel xz-devel bzip2-devel @@ -311,11 +312,16 @@ cd grub-%{tarversion} cp %{SOURCE4} unifont.pcf.gz cp %{SOURCE6} .gitignore git init -git config user.email "grub2-owner@fedoraproject.org" +echo '![[:digit:]][[:digit:]]_*.in' > util/grub.d/.gitignore +echo '!*.[[:digit:]]' > util/.gitignore +git config user.email "%{name}-owner@fedoraproject.org" git config user.name "Fedora Ninjas" +git config gc.auto 0 git add . git commit -a -q -m "%{tarversion} baseline." -git am %{patches} +git am %{patches} util/grub.d/.gitignore +echo '!*.[[:digit:]]' > util/.gitignore git config user.email "%{name}-owner@fedoraproject.org" git config user.name "Fedora Ninjas" git config gc.auto 0 diff --git a/sources b/sources index 6fbad69..69635e2 100644 --- a/sources +++ b/sources @@ -1,4 +1,3 @@ 566c4668b90b610c1f6c0c402cbd6ab0 theme.tar.bz2 8c28087c5fcb3188f1244b390efffdbe unifont-5.1.20080820.pcf.gz be62932eade308a364ea4bbc91295930 grub-2.02~beta2.tar.xz -96db33341a3826adddd54316e8ac27b6 gitignore