| Message ID | 1504676265-21604-2-git-send-email-bmeng.cn@gmail.com |
|---|---|
| State | Accepted |
| Commit | eab44c93ebffc17603a651501c32495ec96c13e5 |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | [U-Boot,v2,1/2] tools: .gitignore: Sort in alphabetical order | expand |
On Tue, Sep 05, 2017 at 10:37:45PM -0700, Bin Meng wrote: > Some files are generated during libfdt build. Ignore them. > > This was wrongly put in the .gitignore in the root directory before. > Now let's remove entries there and put them in the right place. > > Fixes: 34e2c285 ("gitignore: add intermediates from libfdt build") > Signed-off-by: Bin Meng <bmeng.cn@gmail.com> Applied to u-boot/master, thanks!
diff --git a/.gitignore b/.gitignore index f6f5dae..29757aa 100644 --- a/.gitignore +++ b/.gitignore @@ -57,14 +57,6 @@ fit-dtb.blob /include/config/ /include/generated/ -# Since "ee95d10 fdt: Build the new python libfdt module", a number of -# build artifacts and intermediated from the python libfdt module are -# installed into the /tools directory. -/tools/_libfdt.so -/tools/libfdt.py -/tools/libfdt.pyc -/tools/libfdt_wrap.c - # stgit generated dirs patches-* .stgit-edit.txt diff --git a/tools/.gitignore b/tools/.gitignore index 6a487d2..5293d44 100644 --- a/tools/.gitignore +++ b/tools/.gitignore @@ -1,3 +1,4 @@ +/_libfdt.so /atmel_pmecc_params /bin2header /bmp_logo @@ -16,6 +17,9 @@ /img2srec /kwboot /lib/ +/libfdt.py +/libfdt.pyc +/libfdt_wrap.c /mips-relocs /mkenvimage /mkexynosspl
Some files are generated during libfdt build. Ignore them. This was wrongly put in the .gitignore in the root directory before. Now let's remove entries there and put them in the right place. Fixes: 34e2c285 ("gitignore: add intermediates from libfdt build") Signed-off-by: Bin Meng <bmeng.cn@gmail.com> --- Changes in v2: - remove commit 34e2c285 did .gitignore | 8 -------- tools/.gitignore | 4 ++++ 2 files changed, 4 insertions(+), 8 deletions(-)