svn commit: r285766 - in head/sys: conf dev/vt dev/vt/logo

[Luiz Otavio O Souza]

On Tue, Jul 21, 2015 at 5:33 PM, Conrad E. Meyer wrote:
> Author: cem
> Date: Tue Jul 21 20:33:36 2015
> New Revision: 285766
> URL: https://svnweb.freebsd.org/changeset/base/285766
>
> Log:
>   vt: Draw logos per CPU core
>
>   This feature is inspired by another Unix-alike OS commonly found on
>   airplane headrests.
>
>   A number of beasties[0] are drawn at top of framebuffer during boot,
>   based on the number of active SMP CPUs[1]. Console buffer output
>   continues to scroll in the screen area below beastie(s)[2].
>
>   After some time[3] has passed, the beasties are erased leaving the
>   entire terminal for use.
>
>   Includes two 80x80 vga16 beastie graphics and an 80x80 vga16 orb
>   graphic. (The graphics are RLE compressed to save some space -- 3x 3200
>   bytes uncompressed, or 4208 compressed.)
>
>   [0]: The user may select the style of beastie with
>
>       kern.vt.splash_cpu_style=(0|1|2)
>
>   [1]: Or the number may be overridden with tunable kern.vt.splash_ncpu.
>   [2]: https://www.youtube.com/watch?v=UP2jizfr3_o
>   [3]: Configurable with kern.vt.splash_cpu_duration (seconds, def. 10).
>
>   Differential Revision:        https://reviews.freebsd.org/D2181
>   Reviewed by:  dumbbell, emaste
>   Approved by:  markj (mentor)
>   MFC after:    2 weeks
>
> Added:
>   head/sys/dev/vt/logo/logo_beastie.c   (contents, props changed)
>   head/sys/dev/vt/vt_cpulogos.c   (contents, props changed)
> Modified:
>   head/sys/conf/files
>   head/sys/dev/vt/vt.h
>   head/sys/dev/vt/vt_core.c
>
> Modified: head/sys/conf/files
> ==============================================================================
> --- head/sys/conf/files Tue Jul 21 20:30:06 2015        (r285765)
> +++ head/sys/conf/files Tue Jul 21 20:33:36 2015        (r285766)
> @@ -2726,9 +2726,11 @@ dev/vt/hw/efifb/efifb.c          optional vt_efi
>  dev/vt/hw/fb/vt_fb.c           optional vt
>  dev/vt/hw/vga/vt_vga.c         optional vt vt_vga
>  dev/vt/logo/logo_freebsd.c     optional vt splash
> +dev/vt/logo/logo_beastie.c     optional vt splash
>  dev/vt/vt_buf.c                        optional vt
>  dev/vt/vt_consolectl.c         optional vt
>  dev/vt/vt_core.c               optional vt
> +dev/vt/vt_cpulogos.c           optional vt splash
>  dev/vt/vt_font.c               optional vt
>  dev/vt/vt_sysmouse.c           optional vt
>  dev/vte/if_vte.c               optional vte pci
[...]

Hi,

This seems to break kernels without 'device splash'.

One example is the Raspberry Pi kernel:

MAKE=make sh /usr/src/sys/conf/newvers.sh RPI-B
cc  -c -O -pipe  -mfloat-abi=softfp -g -nostdinc  -I. -I/usr/src/sys
-I/usr/src/sys/contrib/libfdt -I/usr/src/sys/gnu/dts/include -D_KERNEL
-DHAVE_KERNEL_OPTION_HEADERS -include opt_global.h -mcpu=arm1176jzf-s
-funwind-tables -ffreestanding -fwrapv -gdwarf-2 -Wall
-Wredundant-decls -Wnested-externs -Wstrict-prototypes
-Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual  -Wundef
-Wno-pointer-sign -D__printf__=__freebsd_kprintf__
-Wmissing-include-dirs -fdiagnostics-show-option  -Wno-unknown-pragmas
 -Wno-error-tautological-compare -Wno-error-empty-body
-Wno-error-parentheses-equality -Wno-error-unused-function
-Wno-error-pointer-sign  -mfpu=none  -std=iso9899:1999 -Werror  vers.c
linking kernel.debug
vt_core.o: In function `vtterm_cnprobe':
/usr/src/sys/dev/vt/vt_core.c:1363: undefined reference to
`vt_logo_sprite_height'
vt_core.o: In function `vt_termsize':
/usr/src/sys/dev/vt/vt_core.c:568: undefined reference to
`vt_logo_sprite_height'
vt_core.o: In function `vt_winsize':
/usr/src/sys/dev/vt/vt_core.c:603: undefined reference to
`vt_logo_sprite_height'
vt_core.o: In function `vt_compute_drawable_area':
/usr/src/sys/dev/vt/vt_core.c:642: undefined reference to
`vt_logo_sprite_height'
vt_core.o: In function `vt_mouse_event':
/usr/src/sys/dev/vt/vt_core.c:1955: undefined reference to
`vt_logo_sprite_height'
vt_core.o:/usr/src/sys/dev/vt/vt_core.c:2632: more undefined
references to `vt_logo_sprite_height' follow
vt_core.o: In function `vt_flush':
/usr/src/sys/dev/vt/vt_core.c:1213: undefined reference to
`vtterm_draw_cpu_logos'
/usr/src/sys/dev/vt/vt_core.c:1222: undefined reference to
`vt_logo_sprite_height'
vt_core.o: In function `vt_scrollmode_kbdevent':
/usr/src/sys/dev/vt/vt_core.c:766: undefined reference to
`vt_logo_sprite_height'
*** [kernel.debug] Error code 1

make[2]: stopped in /usr/obj/arm.armv6/usr/src/sys/RPI-B
1 error

Luiz