Changeset 3e828ea in mainline for .gitignore

Timestamp:

2019-09-23T12:49:29Z (5 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

9be2358

Parents:

9259d20 (diff), 1a4ec93f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Jiri Svoboda <jiri@…> (2019-09-22 12:49:07)

git-committer:

Jiri Svoboda <jiri@…> (2019-09-23 12:49:29)

Message:

Merge changes from master, especially Meson build

File:

• .gitignore (modified) (1 diff)

.gitignore

@@ -1 @@
-*.a
-*.check.c
-*.d
-*.deflate
-*.disasm
-*.la
-*.lo
-*.map
-*.o
-*.prev
-*.pyc
-*.so.*
-/Makefile.common
-/Makefile.config
-/PKG
-/common.h
-/config.h
-/cscope.out
-/downloads
-/hdisk.img
-/image.boot
-/image.iso
-/uImage.bin
-autotool/
-boot/arch/arm32/_link.ld
-boot/arch/ia64/_link.ld
-boot/arch/mips32/_link.ld
-boot/arch/ppc32/_link.ld
-boot/arch/sparc64/_link.ld
-boot/components.h
-boot/components.o.new
-boot/components.s
-boot/components.tar
-boot/components.zip
-boot/components_desc.c
-boot/distroot/
-boot/image.bin
-boot/image.boot
-boot/image.raw
-boot/initrd.img
-boot/initrd.img.gz
-common.h.new
-deps.mk
-doxygen/doxygen.cfg
-doxygen/doxygen.cfg.gen
-doxygen/html/
-doxygen/latex/
-kernel/arch/abs32le/_link.ld
-kernel/arch/amd64/_link.ld
-kernel/arch/arm32/_link.ld
-kernel/arch/ia32/_link.ld
-kernel/arch/ia64/_link.ld
-kernel/arch/mips32/_link.ld
-kernel/arch/ppc32/_link.ld
-kernel/arch/sparc64/_link.ld
-kernel/generic/src/debug/real_map.bin
-kernel/kernel.bin
-kernel/kernel.bin.gz
-kernel/kernel.dump
-kernel/kernel.elf
-kernel/kernel.elf.gz
-kernel/kernel.raw
-tag
+/build
+/build_all
+/doxygen/html
+/doxygen/latex
+/tools/*.pyc
 tags
-tools/amd64-unknown-elf
-tools/arm-linux-gnueabi
-tools/binutils-*.tar.bz2
-tools/downloads/
-tools/gcc-*.tar.bz2
-tools/gdb-*.tar.gz
-tools/i686-pc-linux-gnu
-tools/ia64-pc-linux-gnu
-tools/mips-linux-gnu
-tools/mips64el-linux-gnu
-tools/mipsel-linux-gnu
-tools/ppc-linux-gnu
-tools/ppc64-linux-gnu
-tools/riscv64-unknown-linux-gnu
-tools/sparc64-linux-gnu
 tools/sycek/
 tools/xcw/demo/viewer
-uspace/app/barber/barber
-uspace/app/barber/images.c
-uspace/app/barber/images.h
-uspace/app/barber/images.s
-uspace/app/barber/images.zip
-uspace/app/barber/images_desc.c
-uspace/app/bdsh/bdsh
-uspace/app/bdsh/test-bdsh
-uspace/app/bithenge/bithenge
-uspace/app/blkdump/blkdump
-uspace/app/contacts/contacts
-uspace/app/corecfg/corecfg
-uspace/app/cpptest/cpptest
-uspace/app/date/date
-uspace/app/devctl/devctl
-uspace/app/df/df
-uspace/app/dltest/dltest
-uspace/app/dltests/dltests
-uspace/app/dnscfg/dnscfg
-uspace/app/dnsres/dnsres
-uspace/app/download/download
-uspace/app/edit/edit
-uspace/app/fdisk/fdisk
-uspace/app/fontviewer/fontviewer
-uspace/app/getterm/getterm
-uspace/app/gfxdemo/gfxdemo
-uspace/app/gunzip/gunzip
-uspace/app/hbench/hbench
-uspace/app/inet/inet
-uspace/app/init/init
-uspace/app/init/init.gz
-uspace/app/lprint/lprint
-uspace/app/kill/kill
-uspace/app/killall/killall
-uspace/app/kio/kio
-uspace/app/loc/loc
-uspace/app/logset/logset
-uspace/app/mixerctl/mixerctl
-uspace/app/mkbd/mkbd
-uspace/app/mkexfat/mkexfat
-uspace/app/mkext4/mkext4
-uspace/app/mkfat/mkfat
-uspace/app/mkmfs/mkmfs
-uspace/app/modplay/modplay
-uspace/app/netecho/netecho
-uspace/app/netspeed/netspeed
-uspace/app/nettest1/nettest1
-uspace/app/nettest2/nettest2
-uspace/app/nettest3/nettest3
-uspace/app/nic/nic
-uspace/app/nterm/nterm
-uspace/app/pci/pci
-uspace/app/ping/ping
-uspace/app/ping6/ping6
-uspace/app/pkg/pkg
-uspace/app/redir/redir
-uspace/app/sbi/sbi
-uspace/app/sportdmp/sportdmp
-uspace/app/stats/stats
-uspace/app/sysinfo/sysinfo
-uspace/app/sysinst/sysinst
-uspace/app/taskdump/taskdump
-uspace/app/tester/tester
-uspace/app/testread/testread
-uspace/app/testrunner/testrunner
-uspace/app/testwrit/testwrit
-uspace/app/tetris/tetris
-uspace/app/tmon/tmon
-uspace/app/top/top
-uspace/app/trace/trace
-uspace/app/untar/untar
-uspace/app/usbinfo/usbinfo
-uspace/app/vcalc/vcalc
-uspace/app/vdemo/vdemo
-uspace/app/viewer/viewer
-uspace/app/vlaunch/images.c
-uspace/app/vlaunch/images.h
-uspace/app/vlaunch/images.s
-uspace/app/vlaunch/images.zip
-uspace/app/vlaunch/images_desc.c
-uspace/app/vlaunch/vlaunch
-uspace/app/vol/vol
-uspace/app/vterm/vterm
-uspace/app/vuhid/vuh
-uspace/app/vuhid/vuhid
-uspace/app/wavplay/wavplay
-uspace/app/websrv/websrv
-uspace/app/wifi_supplicant/wifi_supplicant
-uspace/dist/app/
-uspace/dist/app/barber
-uspace/dist/app/bdsh
-uspace/dist/app/bithenge
-uspace/dist/app/blkdump
-uspace/dist/app/corecfg
-uspace/dist/app/cpptest
-uspace/dist/app/date
-uspace/dist/app/devctl
-uspace/dist/app/df
-uspace/dist/app/dltest
-uspace/dist/app/dltests
-uspace/dist/app/dnscfg
-uspace/dist/app/dnsres
-uspace/dist/app/download
-uspace/dist/app/edit
-uspace/dist/app/fdisk
-uspace/dist/app/fontviewer
-uspace/dist/app/getterm
-uspace/dist/app/gunzip
-uspace/dist/app/inet
-uspace/dist/app/kill
-uspace/dist/app/killall
-uspace/dist/app/kio
-uspace/dist/app/loc
-uspace/dist/app/logset
-uspace/dist/app/mixerctl
-uspace/dist/app/mkbd
-uspace/dist/app/mkexfat
-uspace/dist/app/mkfat
-uspace/dist/app/mkmfs
-uspace/dist/app/modplay
-uspace/dist/app/netecho
-uspace/dist/app/netspeed
-uspace/dist/app/nettest1
-uspace/dist/app/nettest2
-uspace/dist/app/nettest3
-uspace/dist/app/nic
-uspace/dist/app/nterm
-uspace/dist/app/ping
-uspace/dist/app/ping6
-uspace/dist/app/pkg
-uspace/dist/app/redir
-uspace/dist/app/sbi
-uspace/dist/app/sportdmp
-uspace/dist/app/stats
-uspace/dist/app/sysinfo
-uspace/dist/app/sysinst
-uspace/dist/app/taskdump
-uspace/dist/app/tester
-uspace/dist/app/testread
-uspace/dist/app/testwrit
-uspace/dist/app/tetris
-uspace/dist/app/tmon
-uspace/dist/app/top
-uspace/dist/app/trace
-uspace/dist/app/untar
-uspace/dist/app/usbinfo
-uspace/dist/app/vcalc
-uspace/dist/app/vdemo
-uspace/dist/app/viewer
-uspace/dist/app/vlaunch
-uspace/dist/app/vterm
-uspace/dist/app/vuh
-uspace/dist/app/wavplay
-uspace/dist/app/websrv
-uspace/dist/app/wifi_supplicant
-uspace/dist/demo.txt
-uspace/dist/demo.wav
-uspace/dist/demo.xm
-uspace/dist/drv/
-uspace/dist/drv/ahci/
-uspace/dist/drv/apic/
-uspace/dist/drv/ar9271/
-uspace/dist/drv/ata_bd/
-uspace/dist/drv/atkbd/
-uspace/dist/drv/cmos-rtc/
-uspace/dist/drv/e1k/
-uspace/dist/drv/ehci/
-uspace/dist/drv/hdaudio/
-uspace/dist/drv/i8042/
-uspace/dist/drv/i8259/
-uspace/dist/drv/icp-ic/
-uspace/dist/drv/icp/
-uspace/dist/drv/isa/
-uspace/dist/drv/kfb/
-uspace/dist/drv/msim-con/
-uspace/dist/drv/ne2k/
-uspace/dist/drv/ns8250/
-uspace/dist/drv/ohci/
-uspace/dist/drv/pc/
-uspace/dist/drv/pciintel/
-uspace/dist/drv/pl050/
-uspace/dist/drv/ps2mouse/
-uspace/dist/drv/root/
-uspace/dist/drv/rootpc/
-uspace/dist/drv/rtl8139/
-uspace/dist/drv/rtl8169/
-uspace/dist/drv/sb16/
-uspace/dist/drv/ski-con/
-uspace/dist/drv/sun4v-con/
-uspace/dist/drv/test1/
-uspace/dist/drv/test2/
-uspace/dist/drv/test3/
-uspace/dist/drv/uhci/
-uspace/dist/drv/usbdiag/
-uspace/dist/drv/usbflbk/
-uspace/dist/drv/usbhid/
-uspace/dist/drv/usbhub/
-uspace/dist/drv/usbmast/
-uspace/dist/drv/usbmid/
-uspace/dist/drv/vhc/
-uspace/dist/drv/virt/
-uspace/dist/drv/xhci/
-uspace/dist/drv/xtkbd/
-uspace/dist/inc/
-uspace/dist/inc/_link.ld
-uspace/dist/inc/c/
-uspace/dist/logo.tga
-uspace/dist/srv/
-uspace/dist/test/
-uspace/drv/audio/hdaudio/hdaudio
-uspace/drv/audio/sb16/sb16
-uspace/drv/block/ahci/ahci
-uspace/drv/block/ata_bd/ata_bd
-uspace/drv/block/ddisk/ddisk
-uspace/drv/block/usbmast/usbmast
-uspace/drv/bus/adb/cuda_adb/cuda_adb
-uspace/drv/bus/isa/isa
-uspace/drv/bus/pci/pciintel/pciintel
-uspace/drv/bus/usb/ehci/ehci
-uspace/drv/bus/usb/ohci/ohci
-uspace/drv/bus/usb/uhci/uhci
-uspace/drv/bus/usb/usbdiag/usbdiag
-uspace/drv/bus/usb/usbflbk/usbflbk
-uspace/drv/bus/usb/usbhub/usbhub
-uspace/drv/bus/usb/usbmid/usbmid
-uspace/drv/bus/usb/vhc/vhc
-uspace/drv/bus/usb/xhci/test-xhci
-uspace/drv/bus/usb/xhci/xhci
-uspace/drv/char/i8042/i8042
-uspace/drv/char/msim-con/msim-con
-uspace/drv/char/ns8250/ns8250
-uspace/drv/char/pc-lpt/pc-lpt
-uspace/drv/char/pl050/pl050
-uspace/drv/char/ps2mouse/ps2mouse
-uspace/drv/char/ski-con/ski-con
-uspace/drv/char/sun4v-con/sun4v-con
-uspace/drv/fb/amdm37x_dispc/amdm37x_dispc
-uspace/drv/fb/kfb/kfb
-uspace/drv/hid/adb-kbd/adb-kbd
-uspace/drv/hid/adb-mouse/adb-mouse
-uspace/drv/hid/atkbd/atkbd
-uspace/drv/hid/ps2mouse/ps2mouse
-uspace/drv/hid/usbhid/usbhid
-uspace/drv/hid/xtkbd/xtkbd
-uspace/drv/intctl/apic/apic
-uspace/drv/intctl/i8259/i8259
-uspace/drv/intctl/icp-ic/icp-ic
-uspace/drv/intctl/obio/obio
-uspace/drv/nic/ar9271/ar9271
-uspace/drv/nic/e1k/e1k
-uspace/drv/nic/ne2k/ne2k
-uspace/drv/nic/rtl8139/rtl8139
-uspace/drv/nic/rtl8169/rtl8169
-uspace/drv/nic/virtio-net/virtio-net
-uspace/drv/platform/amdm37x/amdm37x
-uspace/drv/platform/icp/icp
-uspace/drv/platform/mac/mac
-uspace/drv/platform/malta/malta
-uspace/drv/platform/msim/msim
-uspace/drv/platform/pc/pc
-uspace/drv/platform/rootpc/rootpc
-uspace/drv/platform/ski/ski
-uspace/drv/platform/sun4v/sun4v
-uspace/drv/root/root/root
-uspace/drv/root/virt/virt
-uspace/drv/test/test1/test1
-uspace/drv/test/test2/test2
-uspace/drv/test/test3/test3
-uspace/drv/time/cmos-rtc/cmos-rtc
-uspace/export
-uspace/lib/c/arch/abs32le/_link-dlexe.ld
-uspace/lib/c/arch/abs32le/_link-loader.ld
-uspace/lib/c/arch/abs32le/_link-shlib.ld
-uspace/lib/c/arch/abs32le/_link.ld
-uspace/lib/c/arch/amd64/_link-dlexe.ld
-uspace/lib/c/arch/amd64/_link-loader.ld
-uspace/lib/c/arch/amd64/_link-shlib.ld
-uspace/lib/c/arch/amd64/_link.ld
-uspace/lib/c/arch/arm32/_link-dlexe.ld
-uspace/lib/c/arch/arm32/_link-loader.ld
-uspace/lib/c/arch/arm32/_link-shlib.ld
-uspace/lib/c/arch/arm32/_link.ld
-uspace/lib/c/arch/ia32/_link-dlexe.ld
-uspace/lib/c/arch/ia32/_link-loader.ld
-uspace/lib/c/arch/ia32/_link-shlib.ld
-uspace/lib/c/arch/ia32/_link.ld
-uspace/lib/c/arch/ia64/_link-dlexe.ld
-uspace/lib/c/arch/ia64/_link-loader.ld
-uspace/lib/c/arch/ia64/_link-shlib.ld
-uspace/lib/c/arch/ia64/_link.ld
-uspace/lib/c/arch/mips32/_link-dlexe.ld
-uspace/lib/c/arch/mips32/_link-loader.ld
-uspace/lib/c/arch/mips32/_link-shlib.ld
-uspace/lib/c/arch/mips32/_link.ld
-uspace/lib/c/arch/mips32eb/_link-dlexe.ld
-uspace/lib/c/arch/mips32eb/_link-loader.ld
-uspace/lib/c/arch/mips32eb/_link-shlib.ld
-uspace/lib/c/arch/mips32eb/_link.ld
-uspace/lib/c/arch/ppc32/_link-dlexe.ld
-uspace/lib/c/arch/ppc32/_link-loader.ld
-uspace/lib/c/arch/ppc32/_link-shlib.ld
-uspace/lib/c/arch/ppc32/_link.ld
-uspace/lib/c/arch/sparc64/_link-dlexe.ld
-uspace/lib/c/arch/sparc64/_link-loader.ld
-uspace/lib/c/arch/sparc64/_link-shlib.ld
-uspace/lib/c/arch/sparc64/_link.ld
-uspace/lib/c/test-libc
-uspace/lib/gfx/test-libgfx
-uspace/lib/label/test-liblabel
-uspace/lib/math/test-libmath
-uspace/lib/pcut/test-libpcut-*
-uspace/lib/posix/gcc.specs
-uspace/lib/posix/link.ld
-uspace/lib/posix/test-libposix
-uspace/lib/sif/test-libsif
-uspace/lib/uri/test-liburi
-uspace/srv/audio/hound/hound
-uspace/srv/bd/file_bd/file_bd
-uspace/srv/bd/rd/rd
-uspace/srv/bd/rd/rd.gz
-uspace/srv/bd/sata_bd/sata_bd
-uspace/srv/bd/vbd/vbd
-uspace/srv/clipboard/clipboard
-uspace/srv/devman/devman
-uspace/srv/fs/cdfs/cdfs
-uspace/srv/fs/exfat/exfat
-uspace/srv/fs/ext4fs/ext4fs
-uspace/srv/fs/ext4fs/ext4fs.gz
-uspace/srv/fs/fat/fat
-uspace/srv/fs/fat/fat.gz
-uspace/srv/fs/locfs/locfs
-uspace/srv/fs/mfs/mfs
-uspace/srv/fs/tmpfs/tmpfs
-uspace/srv/fs/udf/udf
-uspace/srv/hid/compositor/compositor
-uspace/srv/hid/compositor/images.c
-uspace/srv/hid/compositor/images.h
-uspace/srv/hid/console/console
-uspace/srv/hid/input/input
-uspace/srv/hid/isdv4_tablet/isdv4_tablet
-uspace/srv/hid/output/output
-uspace/srv/hid/remcons/remcons
-uspace/srv/hid/rfb/rfb
-uspace/srv/hid/s3c24xx_ts/s3c24xx_ts
-uspace/srv/hw/bus/cuda_adb/cuda_adb
-uspace/srv/hw/char/s3c24xx_uart/s3c24ser
-uspace/srv/hw/char/s3c24xx_uart/s3c24xx_uart
-uspace/srv/hw/irc/obio/obio
-uspace/srv/klog/klog
-uspace/srv/loader/loader
-uspace/srv/loader/loader.gz
-uspace/srv/locsrv/locsrv
-uspace/srv/locsrv/locsrv.gz
-uspace/srv/logger/logger
-uspace/srv/logger/logger.gz
-uspace/srv/net/dhcp/dhcp
-uspace/srv/net/dnsrsrv/dnsrsrv
-uspace/srv/net/ethip/ethip
-uspace/srv/net/inetsrv/inetsrv
-uspace/srv/net/loopip/loopip
-uspace/srv/net/nconfsrv/nconfsrv
-uspace/srv/net/slip/slip
-uspace/srv/net/tcp/tcp
-uspace/srv/net/tcp/test-tcp
-uspace/srv/net/udp/udp
-uspace/srv/ns/ns
-uspace/srv/ns/ns.gz
-uspace/srv/taskmon/taskmon
-uspace/srv/test/chardev-test/chardev-test
-uspace/srv/test/ipc-test/ipc-test
-uspace/srv/vfs/vfs
-uspace/srv/vfs/vfs.gz
-uspace/srv/volsrv/test-volsrv
-uspace/srv/volsrv/volsrv