Changes in / [fa70134:32b4302] in mainline


Ignore:
Files:
301 added
275 deleted
20 edited

Legend:

Unmodified
Added
Removed

  • .gitignore

    rfa70134 r32b4302  
    1 *.a
    2 *.check.c
    3 *.d
    4 *.deflate
    5 *.disasm
    6 *.la
    7 *.lo
    8 *.map
    9 *.o
    10 *.prev
    11 *.pyc
    12 *.so.*
    13 /Makefile.common
    14 /Makefile.config
    15 /PKG
    16 /common.h
    17 /config.h
    18 /cscope.out
    19 /downloads
    20 /hdisk.img
    21 /image.boot
    22 /image.iso
    23 /uImage.bin
    24 autotool/
    25 boot/arch/arm32/_link.ld
    26 boot/arch/arm64/_link.ld
    27 boot/arch/ia64/_link.ld
    28 boot/arch/mips32/_link.ld
    29 boot/arch/ppc32/_link.ld
    30 boot/arch/sparc64/_link.ld
    31 boot/components.h
    32 boot/components.o.new
    33 boot/components.s
    34 boot/components.tar
    35 boot/components.zip
    36 boot/components_desc.c
    37 boot/distroot/
    38 boot/image.bin
    39 boot/image.boot
    40 boot/image.raw
    41 boot/initrd.img
    42 boot/initrd.img.gz
    43 common.h.new
    44 deps.mk
    45 doxygen/doxygen.cfg
    46 doxygen/doxygen.cfg.gen
    47 doxygen/html/
    48 doxygen/latex/
    49 kernel/arch/abs32le/_link.ld
    50 kernel/arch/amd64/_link.ld
    51 kernel/arch/arm32/_link.ld
    52 kernel/arch/arm64/_link.ld
    53 kernel/arch/ia32/_link.ld
    54 kernel/arch/ia64/_link.ld
    55 kernel/arch/mips32/_link.ld
    56 kernel/arch/ppc32/_link.ld
    57 kernel/arch/sparc64/_link.ld
    58 kernel/generic/src/debug/real_map.bin
    59 kernel/kernel.bin
    60 kernel/kernel.bin.gz
    61 kernel/kernel.dump
    62 kernel/kernel.elf
    63 kernel/kernel.elf.gz
    64 kernel/kernel.raw
    65 tag
     1/build
     2/build_all
     3/doxygen/html
     4/doxygen/latex
     5/tools/*.pyc
    666tags
    67 tools/amd64-unknown-elf
    68 tools/arm-linux-gnueabi
    69 tools/binutils-*.tar.bz2
    70 tools/downloads/
    71 tools/gcc-*.tar.bz2
    72 tools/gdb-*.tar.gz
    73 tools/i686-pc-linux-gnu
    74 tools/ia64-pc-linux-gnu
    75 tools/mips-linux-gnu
    76 tools/mips64el-linux-gnu
    77 tools/mipsel-linux-gnu
    78 tools/ppc-linux-gnu
    79 tools/ppc64-linux-gnu
    80 tools/riscv64-unknown-linux-gnu
    81 tools/sparc64-linux-gnu
    827tools/sycek/
    838tools/xcw/demo/viewer
    84 uspace/app/barber/barber
    85 uspace/app/barber/images.c
    86 uspace/app/barber/images.h
    87 uspace/app/barber/images.s
    88 uspace/app/barber/images.zip
    89 uspace/app/barber/images_desc.c
    90 uspace/app/bdsh/bdsh
    91 uspace/app/bdsh/test-bdsh
    92 uspace/app/bithenge/bithenge
    93 uspace/app/blkdump/blkdump
    94 uspace/app/contacts/contacts
    95 uspace/app/corecfg/corecfg
    96 uspace/app/cpptest/cpptest
    97 uspace/app/date/date
    98 uspace/app/devctl/devctl
    99 uspace/app/df/df
    100 uspace/app/dltest/dltest
    101 uspace/app/dltests/dltests
    102 uspace/app/dnscfg/dnscfg
    103 uspace/app/dnsres/dnsres
    104 uspace/app/download/download
    105 uspace/app/edit/edit
    106 uspace/app/fdisk/fdisk
    107 uspace/app/fontviewer/fontviewer
    108 uspace/app/getterm/getterm
    109 uspace/app/gunzip/gunzip
    110 uspace/app/hbench/hbench
    111 uspace/app/inet/inet
    112 uspace/app/init/init
    113 uspace/app/init/init.gz
    114 uspace/app/lprint/lprint
    115 uspace/app/kill/kill
    116 uspace/app/killall/killall
    117 uspace/app/kio/kio
    118 uspace/app/loc/loc
    119 uspace/app/logset/logset
    120 uspace/app/mixerctl/mixerctl
    121 uspace/app/mkbd/mkbd
    122 uspace/app/mkexfat/mkexfat
    123 uspace/app/mkext4/mkext4
    124 uspace/app/mkfat/mkfat
    125 uspace/app/mkmfs/mkmfs
    126 uspace/app/modplay/modplay
    127 uspace/app/netecho/netecho
    128 uspace/app/netspeed/netspeed
    129 uspace/app/nettest1/nettest1
    130 uspace/app/nettest2/nettest2
    131 uspace/app/nettest3/nettest3
    132 uspace/app/nic/nic
    133 uspace/app/nterm/nterm
    134 uspace/app/pci/pci
    135 uspace/app/ping/ping
    136 uspace/app/ping6/ping6
    137 uspace/app/pkg/pkg
    138 uspace/app/redir/redir
    139 uspace/app/sbi/sbi
    140 uspace/app/sportdmp/sportdmp
    141 uspace/app/stats/stats
    142 uspace/app/sysinfo/sysinfo
    143 uspace/app/sysinst/sysinst
    144 uspace/app/taskdump/taskdump
    145 uspace/app/tester/tester
    146 uspace/app/testread/testread
    147 uspace/app/testrunner/testrunner
    148 uspace/app/testwrit/testwrit
    149 uspace/app/tetris/tetris
    150 uspace/app/tmon/tmon
    151 uspace/app/top/top
    152 uspace/app/trace/trace
    153 uspace/app/untar/untar
    154 uspace/app/usbinfo/usbinfo
    155 uspace/app/vcalc/vcalc
    156 uspace/app/vdemo/vdemo
    157 uspace/app/viewer/viewer
    158 uspace/app/vlaunch/images.c
    159 uspace/app/vlaunch/images.h
    160 uspace/app/vlaunch/images.s
    161 uspace/app/vlaunch/images.zip
    162 uspace/app/vlaunch/images_desc.c
    163 uspace/app/vlaunch/vlaunch
    164 uspace/app/vol/vol
    165 uspace/app/vterm/vterm
    166 uspace/app/vuhid/vuh
    167 uspace/app/vuhid/vuhid
    168 uspace/app/wavplay/wavplay
    169 uspace/app/websrv/websrv
    170 uspace/app/wifi_supplicant/wifi_supplicant
    171 uspace/dist/app/
    172 uspace/dist/app/barber
    173 uspace/dist/app/bdsh
    174 uspace/dist/app/bithenge
    175 uspace/dist/app/blkdump
    176 uspace/dist/app/corecfg
    177 uspace/dist/app/cpptest
    178 uspace/dist/app/date
    179 uspace/dist/app/devctl
    180 uspace/dist/app/df
    181 uspace/dist/app/dltest
    182 uspace/dist/app/dltests
    183 uspace/dist/app/dnscfg
    184 uspace/dist/app/dnsres
    185 uspace/dist/app/download
    186 uspace/dist/app/edit
    187 uspace/dist/app/fdisk
    188 uspace/dist/app/fontviewer
    189 uspace/dist/app/getterm
    190 uspace/dist/app/gunzip
    191 uspace/dist/app/inet
    192 uspace/dist/app/kill
    193 uspace/dist/app/killall
    194 uspace/dist/app/kio
    195 uspace/dist/app/loc
    196 uspace/dist/app/logset
    197 uspace/dist/app/mixerctl
    198 uspace/dist/app/mkbd
    199 uspace/dist/app/mkexfat
    200 uspace/dist/app/mkfat
    201 uspace/dist/app/mkmfs
    202 uspace/dist/app/modplay
    203 uspace/dist/app/netecho
    204 uspace/dist/app/netspeed
    205 uspace/dist/app/nettest1
    206 uspace/dist/app/nettest2
    207 uspace/dist/app/nettest3
    208 uspace/dist/app/nic
    209 uspace/dist/app/nterm
    210 uspace/dist/app/ping
    211 uspace/dist/app/ping6
    212 uspace/dist/app/pkg
    213 uspace/dist/app/redir
    214 uspace/dist/app/sbi
    215 uspace/dist/app/sportdmp
    216 uspace/dist/app/stats
    217 uspace/dist/app/sysinfo
    218 uspace/dist/app/sysinst
    219 uspace/dist/app/taskdump
    220 uspace/dist/app/tester
    221 uspace/dist/app/testread
    222 uspace/dist/app/testwrit
    223 uspace/dist/app/tetris
    224 uspace/dist/app/tmon
    225 uspace/dist/app/top
    226 uspace/dist/app/trace
    227 uspace/dist/app/untar
    228 uspace/dist/app/usbinfo
    229 uspace/dist/app/vcalc
    230 uspace/dist/app/vdemo
    231 uspace/dist/app/viewer
    232 uspace/dist/app/vlaunch
    233 uspace/dist/app/vterm
    234 uspace/dist/app/vuh
    235 uspace/dist/app/wavplay
    236 uspace/dist/app/websrv
    237 uspace/dist/app/wifi_supplicant
    238 uspace/dist/demo.txt
    239 uspace/dist/demo.wav
    240 uspace/dist/demo.xm
    241 uspace/dist/drv/
    242 uspace/dist/drv/ahci/
    243 uspace/dist/drv/apic/
    244 uspace/dist/drv/ar9271/
    245 uspace/dist/drv/ata_bd/
    246 uspace/dist/drv/atkbd/
    247 uspace/dist/drv/cmos-rtc/
    248 uspace/dist/drv/e1k/
    249 uspace/dist/drv/ehci/
    250 uspace/dist/drv/hdaudio/
    251 uspace/dist/drv/i8042/
    252 uspace/dist/drv/i8259/
    253 uspace/dist/drv/icp-ic/
    254 uspace/dist/drv/icp/
    255 uspace/dist/drv/isa/
    256 uspace/dist/drv/kfb/
    257 uspace/dist/drv/msim-con/
    258 uspace/dist/drv/ne2k/
    259 uspace/dist/drv/ns8250/
    260 uspace/dist/drv/ohci/
    261 uspace/dist/drv/pc/
    262 uspace/dist/drv/pciintel/
    263 uspace/dist/drv/pl050/
    264 uspace/dist/drv/ps2mouse/
    265 uspace/dist/drv/root/
    266 uspace/dist/drv/rootpc/
    267 uspace/dist/drv/rtl8139/
    268 uspace/dist/drv/rtl8169/
    269 uspace/dist/drv/sb16/
    270 uspace/dist/drv/ski-con/
    271 uspace/dist/drv/sun4v-con/
    272 uspace/dist/drv/test1/
    273 uspace/dist/drv/test2/
    274 uspace/dist/drv/test3/
    275 uspace/dist/drv/uhci/
    276 uspace/dist/drv/usbdiag/
    277 uspace/dist/drv/usbflbk/
    278 uspace/dist/drv/usbhid/
    279 uspace/dist/drv/usbhub/
    280 uspace/dist/drv/usbmast/
    281 uspace/dist/drv/usbmid/
    282 uspace/dist/drv/vhc/
    283 uspace/dist/drv/virt/
    284 uspace/dist/drv/xhci/
    285 uspace/dist/drv/xtkbd/
    286 uspace/dist/inc/
    287 uspace/dist/inc/_link.ld
    288 uspace/dist/inc/c/
    289 uspace/dist/logo.tga
    290 uspace/dist/srv/
    291 uspace/dist/test/
    292 uspace/drv/audio/hdaudio/hdaudio
    293 uspace/drv/audio/sb16/sb16
    294 uspace/drv/block/ahci/ahci
    295 uspace/drv/block/ata_bd/ata_bd
    296 uspace/drv/block/ddisk/ddisk
    297 uspace/drv/block/usbmast/usbmast
    298 uspace/drv/bus/adb/cuda_adb/cuda_adb
    299 uspace/drv/bus/isa/isa
    300 uspace/drv/bus/pci/pciintel/pciintel
    301 uspace/drv/bus/usb/ehci/ehci
    302 uspace/drv/bus/usb/ohci/ohci
    303 uspace/drv/bus/usb/uhci/uhci
    304 uspace/drv/bus/usb/usbdiag/usbdiag
    305 uspace/drv/bus/usb/usbflbk/usbflbk
    306 uspace/drv/bus/usb/usbhub/usbhub
    307 uspace/drv/bus/usb/usbmid/usbmid
    308 uspace/drv/bus/usb/vhc/vhc
    309 uspace/drv/bus/usb/xhci/test-xhci
    310 uspace/drv/bus/usb/xhci/xhci
    311 uspace/drv/char/i8042/i8042
    312 uspace/drv/char/msim-con/msim-con
    313 uspace/drv/char/ns8250/ns8250
    314 uspace/drv/char/pc-lpt/pc-lpt
    315 uspace/drv/char/pl011/pl011
    316 uspace/drv/char/pl050/pl050
    317 uspace/drv/char/ps2mouse/ps2mouse
    318 uspace/drv/char/ski-con/ski-con
    319 uspace/drv/char/sun4v-con/sun4v-con
    320 uspace/drv/fb/amdm37x_dispc/amdm37x_dispc
    321 uspace/drv/fb/kfb/kfb
    322 uspace/drv/hid/adb-kbd/adb-kbd
    323 uspace/drv/hid/adb-mouse/adb-mouse
    324 uspace/drv/hid/atkbd/atkbd
    325 uspace/drv/hid/ps2mouse/ps2mouse
    326 uspace/drv/hid/usbhid/usbhid
    327 uspace/drv/hid/xtkbd/xtkbd
    328 uspace/drv/intctl/apic/apic
    329 uspace/drv/intctl/gicv2/gicv2
    330 uspace/drv/intctl/i8259/i8259
    331 uspace/drv/intctl/icp-ic/icp-ic
    332 uspace/drv/intctl/obio/obio
    333 uspace/drv/nic/ar9271/ar9271
    334 uspace/drv/nic/e1k/e1k
    335 uspace/drv/nic/ne2k/ne2k
    336 uspace/drv/nic/rtl8139/rtl8139
    337 uspace/drv/nic/rtl8169/rtl8169
    338 uspace/drv/nic/virtio-net/virtio-net
    339 uspace/drv/platform/amdm37x/amdm37x
    340 uspace/drv/platform/arm64virt/arm64virt
    341 uspace/drv/platform/icp/icp
    342 uspace/drv/platform/mac/mac
    343 uspace/drv/platform/malta/malta
    344 uspace/drv/platform/msim/msim
    345 uspace/drv/platform/pc/pc
    346 uspace/drv/platform/rootpc/rootpc
    347 uspace/drv/platform/ski/ski
    348 uspace/drv/platform/sun4v/sun4v
    349 uspace/drv/root/root/root
    350 uspace/drv/root/virt/virt
    351 uspace/drv/test/test1/test1
    352 uspace/drv/test/test2/test2
    353 uspace/drv/test/test3/test3
    354 uspace/drv/time/cmos-rtc/cmos-rtc
    355 uspace/export
    356 uspace/lib/c/test-libc
    357 uspace/lib/label/test-liblabel
    358 uspace/lib/math/test-libmath
    359 uspace/lib/pcut/test-libpcut-*
    360 uspace/lib/posix/gcc.specs
    361 uspace/lib/posix/link.ld
    362 uspace/lib/posix/test-libposix
    363 uspace/lib/sif/test-libsif
    364 uspace/lib/uri/test-liburi
    365 uspace/srv/audio/hound/hound
    366 uspace/srv/bd/file_bd/file_bd
    367 uspace/srv/bd/rd/rd
    368 uspace/srv/bd/rd/rd.gz
    369 uspace/srv/bd/sata_bd/sata_bd
    370 uspace/srv/bd/vbd/vbd
    371 uspace/srv/clipboard/clipboard
    372 uspace/srv/devman/devman
    373 uspace/srv/fs/cdfs/cdfs
    374 uspace/srv/fs/exfat/exfat
    375 uspace/srv/fs/ext4fs/ext4fs
    376 uspace/srv/fs/ext4fs/ext4fs.gz
    377 uspace/srv/fs/fat/fat
    378 uspace/srv/fs/fat/fat.gz
    379 uspace/srv/fs/locfs/locfs
    380 uspace/srv/fs/mfs/mfs
    381 uspace/srv/fs/tmpfs/tmpfs
    382 uspace/srv/fs/udf/udf
    383 uspace/srv/hid/compositor/compositor
    384 uspace/srv/hid/compositor/images.c
    385 uspace/srv/hid/compositor/images.h
    386 uspace/srv/hid/console/console
    387 uspace/srv/hid/input/input
    388 uspace/srv/hid/isdv4_tablet/isdv4_tablet
    389 uspace/srv/hid/output/output
    390 uspace/srv/hid/remcons/remcons
    391 uspace/srv/hid/rfb/rfb
    392 uspace/srv/hid/s3c24xx_ts/s3c24xx_ts
    393 uspace/srv/hw/bus/cuda_adb/cuda_adb
    394 uspace/srv/hw/char/s3c24xx_uart/s3c24ser
    395 uspace/srv/hw/char/s3c24xx_uart/s3c24xx_uart
    396 uspace/srv/hw/irc/obio/obio
    397 uspace/srv/klog/klog
    398 uspace/srv/loader/loader
    399 uspace/srv/loader/loader.gz
    400 uspace/srv/locsrv/locsrv
    401 uspace/srv/locsrv/locsrv.gz
    402 uspace/srv/logger/logger
    403 uspace/srv/logger/logger.gz
    404 uspace/srv/net/dhcp/dhcp
    405 uspace/srv/net/dnsrsrv/dnsrsrv
    406 uspace/srv/net/ethip/ethip
    407 uspace/srv/net/inetsrv/inetsrv
    408 uspace/srv/net/loopip/loopip
    409 uspace/srv/net/nconfsrv/nconfsrv
    410 uspace/srv/net/slip/slip
    411 uspace/srv/net/tcp/tcp
    412 uspace/srv/net/tcp/test-tcp
    413 uspace/srv/net/udp/udp
    414 uspace/srv/ns/ns
    415 uspace/srv/ns/ns.gz
    416 uspace/srv/taskmon/taskmon
    417 uspace/srv/test/chardev-test/chardev-test
    418 uspace/srv/test/ipc-test/ipc-test
    419 uspace/srv/vfs/vfs
    420 uspace/srv/vfs/vfs.gz
    421 uspace/srv/volsrv/test-volsrv
    422 uspace/srv/volsrv/volsrv
    423 uspace/drv/block/virtio-blk/virtio-blk

  • .travis.yml

    rfa70134 r32b4302  
    6161  - sudo apt-get update -qq
    6262  - sudo apt-get install -qq genisoimage
     63  - sudo apt-get install -qq python3-pip
     64  - sudo apt-get install -qq python3-setuptools
     65  - pip3 install ninja
     66  - pip3 install meson
    6367  - ./tools/travis.sh install
    6468script:

  • Makefile

    rfa70134 r32b4302  
    2727#
    2828
    29 # Just for this Makefile. Sub-makes will run in parallel if requested.
    30 .NOTPARALLEL:
    31 
    32 CCHECK = tools/sycek/ccheck
    3329CSCOPE = cscope
    3430FORMAT = clang-format
    35 CHECK = tools/check.sh
    36 CONFIG = tools/config.py
    37 AUTOTOOL = tools/autotool.py
    38 SANDBOX = autotool
    3931
    40 CONFIG_RULES = HelenOS.config
    41 
    42 COMMON_MAKEFILE = Makefile.common
    43 COMMON_HEADER = common.h
    44 
    45 CONFIG_MAKEFILE = Makefile.config
    46 CONFIG_HEADER = config.h
    4732ERRNO_HEADER = abi/include/abi/errno.h
    4833ERRNO_INPUT = abi/include/abi/errno.in
    4934
    50 .PHONY: all precheck cscope cscope_parts autotool config_auto config_default config distclean clean check releasefile release common boot kernel uspace export-posix space
     35.PHONY: nothing cscope cscope_parts format ccheck ccheck-fix space check_errno
    5136
    52 all: kernel uspace export-cross test-xcw
    53         $(MAKE) -r -C boot PRECHECK=$(PRECHECK)
    54 
    55 common: $(COMMON_MAKEFILE) $(COMMON_HEADER) $(CONFIG_MAKEFILE) $(CONFIG_HEADER) $(ERRNO_HEADER)
    56 
    57 kernel: common
    58         $(MAKE) -r -C kernel PRECHECK=$(PRECHECK)
    59 
    60 uspace: common
    61         $(MAKE) -r -C uspace PRECHECK=$(PRECHECK)
    62 
    63 test-xcw: uspace export-cross
    64         export PATH=$$PATH:$(abspath tools/xcw/bin) && $(MAKE) -r -C tools/xcw/demo
    65 
    66 export-posix: common
    67 ifndef EXPORT_DIR
    68         @echo ERROR: Variable EXPORT_DIR is not defined. && false
    69 else
    70         $(MAKE) -r -C uspace export EXPORT_DIR=$(abspath $(EXPORT_DIR))
    71 endif
    72 
    73 export-cross: common
    74         $(MAKE) -r -C uspace export EXPORT_DIR=$(abspath uspace/export)
    75 
    76 precheck: clean
    77         $(MAKE) -r all PRECHECK=y
     37nothing:
    7838
    7939cscope:
    … …  
    8949        find abi kernel boot uspace -type f -regex '^.*\.[ch]$$' | xargs $(FORMAT) -i -sort-includes -style=file
    9050
    91 ccheck: $(CCHECK)
     51ccheck:
    9252        cd tools && ./build-ccheck.sh
    9353        tools/ccheck.sh
    9454
    95 ccheck-fix: $(CCHECK)
     55ccheck-fix:
    9656        cd tools && ./build-ccheck.sh
    9757        tools/ccheck.sh --fix
    9858
    99 $(CCHECK):
    100         cd tools && ./build-ccheck.sh
    101 
    10259space:
    10360        tools/srepl '[ \t]\+$$' ''
    104 
    105 doxy:
    106         $(MAKE) -r -C doxygen
    107 
    108 # Pre-integration build check
    109 check: ccheck $(CHECK)
    110 ifdef JOBS
    111         $(CHECK) -j $(JOBS)
    112 else
    113         $(CHECK) -j $(shell nproc)
    114 endif
    11561
    11662# `sed` pulls a list of "compatibility-only" error codes from `errno.in`,
    … …  
    12167        git grep -n -f - -- ':(exclude)abi' ':(exclude)uspace/lib/posix'
    12268
    123 # Autotool (detects compiler features)
    124 
    125 autotool $(COMMON_MAKEFILE) $(COMMON_HEADER): $(CONFIG_MAKEFILE) $(AUTOTOOL)
    126         $(AUTOTOOL)
    127         diff -q $(COMMON_HEADER).new $(COMMON_HEADER) 2> /dev/null; if [ $$? -ne 0 ]; then mv -f $(COMMON_HEADER).new $(COMMON_HEADER); fi
    128 
    129 # Build-time configuration
    130 
    131 config_default $(CONFIG_MAKEFILE) $(CONFIG_HEADER): $(CONFIG_RULES)
    132 ifeq ($(HANDS_OFF),y)
    133         $(CONFIG) $< hands-off $(PROFILE)
    134 else
    135         $(CONFIG) $< default $(PROFILE)
    136 endif
    137 
    138 config: $(CONFIG_RULES)
    139         $(CONFIG) $<
    140 
    141 random-config: $(CONFIG_RULES)
    142         $(CONFIG) $< random
    143 
    144 # Release files
    145 
    146 releasefile: all
    147         $(MAKE) -r -C release releasefile
    148 
    149 release:
    150         $(MAKE) -r -C release release
    151 
    152 # Cleaning
    153 
    154 distclean: clean
    155         rm -f $(CSCOPE).out $(COMMON_MAKEFILE) $(COMMON_HEADER) $(CONFIG_MAKEFILE) $(CONFIG_HEADER) tools/*.pyc tools/checkers/*.pyc release/HelenOS-*
    156 
    157 clean:
    158         rm -fr $(SANDBOX)
    159         $(MAKE) -r -C kernel clean
    160         $(MAKE) -r -C uspace clean
    161         $(MAKE) -r -C boot clean
    162         $(MAKE) -r -C doxygen clean
    163         $(MAKE) -r -C tools/xcw/demo clean
    164 
    16569$(ERRNO_HEADER): $(ERRNO_INPUT)
    16670        echo '/* Generated file. Edit errno.in instead. */' > $@.new
    16771        sed 's/__errno_entry(\([^,]*\),\([^,]*\),.*/#define \1 __errno_t(\2)/' < $< >> $@.new
    16872        mv $@.new $@
    169 
    170 -include Makefile.local

  • boot/arch/ia64/_link.ld.in

    rfa70134 r32b4302  
    77                *(BOOTSTRAP);
    88                *(.text);
     9                *(.text.*);
    910                *(.sdata);
    1011                *(.sdata2);

  • boot/arch/ppc32/_link.ld.in

    rfa70134 r32b4302  
    77                *(BOOTSTRAP);
    88                *(.text);
     9                *(.text.*);
    910        }
    1011        .data : {

  • boot/arch/sparc64/_link.ld.in

    rfa70134 r32b4302  
    66                loader_start = .;
    77                *(BOOTSTRAP);
    8                 *(.text);
     8                *(.text.*);
    99
    1010                *(.data);       /* initialized data */

  • boot/generic/src/version.c

    rfa70134 r32b4302  
    3232
    3333static const char *project = "HelenOS bootloader";
    34 static const char *copyright = STRING(COPYRIGHT);
    35 static const char *release = STRING(RELEASE);
    36 static const char *name = STRING(NAME);
     34static const char *copyright = STRING(HELENOS_COPYRIGHT);
     35static const char *release = STRING(HELENOS_RELEASE);
     36static const char *name = STRING(HELENOS_CODENAME);
    3737static const char *arch = STRING(KARCH);
    3838

  • kernel/generic/src/main/version.c

    rfa70134 r32b4302  
    3838
    3939static const char *project = "SPARTAN kernel";
    40 static const char *copyright = STRING(COPYRIGHT);
    41 static const char *release = STRING(RELEASE);
    42 static const char *name = STRING(NAME);
     40static const char *copyright = STRING(HELENOS_COPYRIGHT);
     41static const char *release = STRING(HELENOS_RELEASE);
     42static const char *name = STRING(HELENOS_CODENAME);
    4343static const char *arch = STRING(KARCH);
    4444

  • tools/cc.sh

    rfa70134 r32b4302  
    3636EOF
    3737
     38# Find out the path to the script.
     39SOURCE_DIR=`which -- "$0" 2>/dev/null`
     40# Maybe we are running bash.
     41[ -z "$SOURCE_DIR" ] && SOURCE_DIR=`which -- "$BASH_SOURCE"`
     42[ -z "$SOURCE_DIR" ] && exit 1
     43SOURCE_DIR=`dirname -- "$SOURCE_DIR"`
     44SOURCE_DIR=`cd $SOURCE_DIR && cd .. && echo $PWD`
     45
    3846echo ""
    3947
    40 git grep 'Copyright ([cC])' | \
     48git -C "$SOURCE_DIR" grep 'Copyright ([cC])' | \
    4149        sed -E -n 's/^.*(Copyright \([cC]\) (20[0-9][0-9]-)?20[0-9][0-9],? [-a-zA-Z., ]*[-a-zA-Z.]$)/\1/p' | \
    4250        sed -E 's/ ( )+/ /' | \

  • tools/config.py

    rfa70134 r32b4302  
    4343
    4444ARGPOS_RULES = 1
    45 ARGPOS_CHOICE = 2
    46 ARGPOS_PRESET = 3
     45ARGPOS_PRESETS_DIR = 2
     46ARGPOS_CHOICE = 3
     47ARGPOS_PRESET = 4
     48ARGPOS_MASK_PLATFORM = 3
    4749
    4850RULES_FILE = sys.argv[ARGPOS_RULES]
    4951MAKEFILE = 'Makefile.config'
    5052MACROS = 'config.h'
    51 PRESETS_DIR = 'defaults'
     53PRESETS_DIR = sys.argv[ARGPOS_PRESETS_DIR]
    5254
    5355class BinaryOp:
    … …  
    536538
    537539        try:
    538                 version = subprocess.Popen(['git', 'log', '-1', '--pretty=%h'], stdout = subprocess.PIPE).communicate()[0].decode().strip()
     540                version = subprocess.Popen(['git', '-C', os.path.dirname(RULES_FILE), 'log', '-1', '--pretty=%h'], stdout = subprocess.PIPE).communicate()[0].decode().strip()
    539541                sys.stderr.write("ok\n")
    540542        except:
    … …  
    689691        else:
    690692                preset = None
     693
     694        mask_platform = (len(sys.argv) > ARGPOS_MASK_PLATFORM and sys.argv[ARGPOS_MASK_PLATFORM] == "--mask-platform")
    691695
    692696        # Input configuration file can be specified on command line
    … …  
    755759                        options = []
    756760                        opt2row = {}
    757                         cnt = 1
    758 
    759                         options.append("  --- Load preconfigured defaults ... ")
     761                        cnt = 0
     762
     763                        if not mask_platform:
     764                                cnt += 1
     765                                options.append("  --- Load preconfigured defaults ... ")
    760766
    761767                        for rule in rules:
    … …  
    764770                                if cond and not cond.evaluate(config):
    765771                                        continue
     772
     773                                if mask_platform and (varname == "PLATFORM" or varname == "MACHINE" or varname == "COMPILER"):
     774                                        rule = varname, vartype, "(locked) " + name, choices, cond
    766775
    767776                                if varname == selname:
    … …  
    811820                                        continue
    812821
    813                         if value == 0:
     822                        if value == 0 and not mask_platform:
    814823                                profile = choose_profile(PRESETS_DIR, MAKEFILE, screen, config)
    815824                                if profile != None:
    … …  
    828837                        else:
    829838                                value = config[selname]
     839
     840                        if mask_platform and (selname == "PLATFORM" or selname == "MACHINE" or selname == "COMPILER"):
     841                                        continue
    830842
    831843                        if seltype == 'choice':

  • tools/ew.py

    rfa70134 r32b4302  
    3333"""
    3434
     35import inspect
    3536import os
     37import platform
     38import re
     39import subprocess
    3640import sys
    37 import subprocess
    38 import autotool
    39 import platform
    4041import thread
    4142import time
    4243
    4344overrides = {}
     45
     46CONFIG = 'Makefile.config'
     47
     48TOOLS_DIR = os.path.dirname(inspect.getabsfile(inspect.currentframe()))
     49
     50def read_config():
     51        "Read HelenOS build configuration"
     52
     53        inf = open(CONFIG, 'r')
     54        config = {}
     55
     56        for line in inf:
     57                res = re.match(r'^(?:#!# )?([^#]\w*)\s*=\s*(.*?)\s*$', line)
     58                if (res):
     59                        config[res.group(1)] = res.group(2)
     60
     61        inf.close()
     62        return config
    4463
    4564def is_override(str):
    … …  
    164183def hdisk_mk():
    165184        if not os.path.exists('hdisk.img'):
    166                 subprocess.call('tools/mkfat.py 1048576 uspace/dist/data hdisk.img', shell = True)
     185                subprocess.call(TOOLS_DIR + '/mkfat.py 1048576 dist/data hdisk.img', shell = True)
    167186
    168187def qemu_bd_options():
    … …  
    298317
    299318def ski_run(platform, machine, processor):
    300         run_in_console('ski -i tools/conf/ski.conf', 'HelenOS/ia64 on ski')
     319        run_in_console('ski -i ' + TOOLS_DIR + '/conf/ski.conf', 'HelenOS/ia64 on ski')
    301320
    302321def msim_run(platform, machine, processor):
    303322        hdisk_mk()
    304         run_in_console('msim -c tools/conf/msim.conf', 'HelenOS/mips32 on msim')
     323        run_in_console('msim -c ' + TOOLS_DIR + '/conf/msim.conf', 'HelenOS/mips32 on msim')
    305324
    306325def spike_run(platform, machine, processor):
    … …  
    495514                        exit()
    496515
    497         config = {}
    498         autotool.read_config(autotool.CONFIG, config)
     516        config = read_config()
    499517
    500518        if 'PLATFORM' in config.keys():

  • tools/srepl

    rfa70134 r32b4302  
    11#!/bin/sh
     2
     3#
     4# Copyright (c) 2019 Jiří Zárevúcky
     5# All rights reserved.
     6#
     7# Redistribution and use in source and binary forms, with or without
     8# modification, are permitted provided that the following conditions
     9# are met:
     10#
     11# - Redistributions of source code must retain the above copyright
     12#   notice, this list of conditions and the following disclaimer.
     13# - Redistributions in binary form must reproduce the above copyright
     14#   notice, this list of conditions and the following disclaimer in the
     15#   documentation and/or other materials provided with the distribution.
     16# - The name of the author may not be used to endorse or promote products
     17#   derived from this software without specific prior written permission.
     18#
     19# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
     20# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
     21# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
     22# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
     23# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
     24# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
     25# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
     26# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
     27# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
     28# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     29#
    230
    331usage()

  • tools/travis.sh

    rfa70134 r32b4302  
    8787    echo "Will try to run C style check."
    8888    echo
    89     make ccheck || exit 1
     89    cd tools
     90    ./build-ccheck.sh || exit 1
     91    cd ..
     92    tools/ccheck.sh || exit 1
    9093    echo "C style check passed."
    9194    exit 0
    … …  
    154157    fi
    155158
    156 
    157159    # Build it
    158     make "PROFILE=$H_ARCH" HANDS_OFF=y || exit 1
    159     test -s "$H_OUTPUT_FILENAME" || exit 1
     160    SRCDIR="$PWD"
     161
     162    mkdir -p build/$H_ARCH || exit 1
     163    cd build/$H_ARCH
     164
     165    export PATH="/usr/local/cross/bin:$PATH"
     166
     167    $SRCDIR/configure.sh $H_ARCH || exit 1
     168    ninja || exit 1
     169    ninja image_path || exit 1
     170
     171    cd $SRCDIR
    160172
    161173    echo

  • tools/xcw/bin/helenos-cc

    rfa70134 r32b4302  
    3232#
    3333
     34
     35
    3436XCW="$(dirname "$0")"
    3537SRC_ROOT="$XCW/../../.."
    3638if [ -z "$EXPORT_DIR" ]; then
    37         EXPORT_DIR="$SRC_ROOT/uspace/export"
     39        EXPORT_DIR="$SRC_ROOT/build/dist"
    3840fi
    39 UARCH="$("$XCW"/helenos-bld-config --uarch)"
    40 CC="$("$XCW"/helenos-bld-config --cc)"
    41 CFLAGS="$("$XCW"/helenos-bld-config --cflags)"
    42 ENDIAN="$("$XCW"/helenos-bld-config --endian)"
    4341
    44 echo helenos-cc "$@"
    45 "$CC" \
    46     -O3 -fexec-charset=UTF-8 -fwide-exec-charset=UTF-32LE -finput-charset=UTF-8 \
    47     $CFLAGS \
    48     -Wall -Wextra -Wno-clobbered -Wno-unused-parameter -Wmissing-prototypes \
    49     -std=gnu99 -Werror-implicit-function-declaration -Wwrite-strings -ggdb \
    50     -fno-omit-frame-pointer \
    51     -D "$ENDIAN" \
    52     "$@" \
    53     -I"$XCW"/../include \
    54     -I"$EXPORT_DIR"/include/libc \
    55     -I"$EXPORT_DIR"/include
     42HELENOS_EXPORT_ROOT="$EXPORT_DIR"
     43
     44source "${EXPORT_DIR}/config/config.sh"
     45
     46# CC is a compilation driver, so we should check which stage of compilation
     47# is actually running and select which flags to provide. This makes no
     48# difference for GCC, but e.g. clang warns when a flag is provided that is
     49# unused
     50
     51needs_cflags=true
     52needs_ldflags=true
     53
     54for flag in "$@"; do
     55        case "$flag" in
     56                -E)
     57                        needs_cflags=false
     58                        needs_ldflags=false
     59                        break
     60                        ;;
     61                -c|-S)
     62                        needs_ldflags=false
     63                        break
     64                        ;;
     65        esac
     66done
     67
     68flags="-fwide-exec-charset=UTF-32LE -finput-charset=UTF-8 -fexec-charset=UTF-8"
     69flags="$flags -isystem ${HELENOS_EXPORT_ROOT}/include/libc -idirafter ${HELENOS_EXPORT_ROOT}/include"
     70
     71if $needs_cflags; then
     72        flags="$flags -O3 \
     73            -Wall -Wextra -Wno-clobbered -Wno-unused-parameter -Wmissing-prototypes \
     74            -std=gnu99 -Werror-implicit-function-declaration -Wwrite-strings -ggdb"
     75
     76        flags="$flags $HELENOS_CFLAGS"
     77fi
     78
     79if $needs_ldflags; then
     80        flags="$flags $HELENOS_LDFLAGS"
     81fi
     82
     83flags="$flags $@"
     84
     85if $needs_ldflags; then
     86        flags="$flags $HELENOS_LDLIBS"
     87fi
     88
     89echo "helenos-cc" "$@"
     90PATH="$HELENOS_CROSS_PATH:$PATH" "${HELENOS_TARGET}-gcc" $flags

  • tools/xcw/bin/helenos-pkg-config

    rfa70134 r32b4302  
    3434XCW="$(dirname "$0")"
    3535SRC_ROOT="$XCW/../../.."
    36 UARCH="$("$XCW"/helenos-bld-config --uarch)"
    3736if [ -z "$EXPORT_DIR" ]; then
    38         EXPORT_DIR="$SRC_ROOT/uspace/export"
     37        EXPORT_DIR="$SRC_ROOT/build/dist"
    3938fi
    4039INCLUDE_DIR="$EXPORT_DIR/include"

  • tools/xcw/demo/Makefile

    rfa70134 r32b4302  
    5757
    5858$(output): $(objects)
    59         $(LD) -o $@ $^ $(LIBS)
     59        $(CC) -o $@ $^ $(LIBS)
    6060
    6161%.o: %.c

  • uspace/app/download/main.c

    rfa70134 r32b4302  
    4949#define NAME "download"
    5050#ifdef TIMESTAMP_UNIX
    51 #define VERSION STRING(RELEASE) "-" STRING(TIMESTAMP_UNIX)
     51#define VERSION STRING(HELENOS_RELEASE) "-" STRING(TIMESTAMP_UNIX)
    5252#else
    53 #define VERSION STRING(RELEASE)
     53#define VERSION STRING(HELENOS_RELEASE)
    5454#endif
    5555#define USER_AGENT "HelenOS-" NAME "/" VERSION

  • uspace/app/getterm/version.c

    rfa70134 r32b4302  
    3939#include "version.h"
    4040
    41 static const char *copyright = STRING(COPYRIGHT);
    42 static const char *release = STRING(RELEASE);
    43 static const char *name = STRING(NAME);
     41static const char *copyright = STRING(HELENOS_COPYRIGHT);
     42static const char *release = STRING(HELENOS_RELEASE);
     43static const char *name = STRING(HELENOS_CODENAME);
    4444static const char *arch = STRING(UARCH);
    4545

  • uspace/lib/pcut/update-from-master.sh

    rfa70134 r32b4302  
    2828# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    2929#
     30
     31# FIXME: update for meson config
    3032
    3133run_echo() {

  • version

    rfa70134 r32b4302  
    2727#
    2828
    29 ## This file defines the release information of HelenOS.
    30 #
    31 # The release string RELEASE consists of three or four components
    32 # (version, patch level, sublevel and optionally an extra level).
    33 #
    34 # The NAME string is the code name of the given release.
    35 #
    3629
    37 VERSION = 0
    38 PATCHLEVEL = 9
    39 SUBLEVEL = 1
    40 
    41 ifdef EXTRAVERSION
    42         RELEASE = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL).$(EXTRAVERSION)
    43 else
    44         RELEASE = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)
    45 endif
    46 
    47 NAME = Armonia
    48 COPYRIGHT = Copyright (c) 2001-2019 HelenOS project
     30HELENOS_RELEASE = 0.9.1
     31HELENOS_CODENAME = Armonia
     32HELENOS_COPYRIGHT = Copyright (c) 2001-2019 HelenOS project
Note: See TracChangeset for help on using the changeset viewer.