mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-12 21:57:43 +00:00
db4bfcba7b
Use "select" to ensure that the required kconfig symbols are set as expected. Drop HOSTAUDIO since it is now equivalent to UML_SOUND. Set CONFIG_SOUND=m in ARCH=um defconfig files to maintain the status quo of the default configs. Allow SOUND with UML regardless of HAS_IOMEM. Otherwise there is a kconfig warning for unmet dependencies. (This was not an issue when SOUND was defined in arch/um/drivers/Kconfig. I have done 50 randconfig builds and didn't find any issues.) This fixes build errors when CONFIG_SOUND is not set: ld: arch/um/drivers/hostaudio_kern.o: in function `hostaudio_cleanup_module': hostaudio_kern.c:(.exit.text+0xa): undefined reference to `unregister_sound_mixer' ld: hostaudio_kern.c:(.exit.text+0x15): undefined reference to `unregister_sound_dsp' ld: arch/um/drivers/hostaudio_kern.o: in function `hostaudio_init_module': hostaudio_kern.c:(.init.text+0x19): undefined reference to `register_sound_dsp' ld: hostaudio_kern.c:(.init.text+0x31): undefined reference to `register_sound_mixer' ld: hostaudio_kern.c:(.init.text+0x49): undefined reference to `unregister_sound_dsp' and this kconfig warning: WARNING: unmet direct dependencies detected for SOUND Fixes:1da177e4c3
("Linux-2.6.12-rc2") Fixes:d886e87cb8
("sound: make OSS sound core optional") Signed-off-by: Randy Dunlap <rdunlap@infradead.org> Reported-by: kernel test robot <lkp@intel.com> Closes: lore.kernel.org/r/202307141416.vxuRVpFv-lkp@intel.com Cc: Richard Weinberger <richard@nod.at> Cc: Anton Ivanov <anton.ivanov@cambridgegreys.com> Cc: Johannes Berg <johannes@sipsolutions.net> Cc: linux-um@lists.infradead.org Cc: Tejun Heo <tj@kernel.org> Cc: Takashi Iwai <tiwai@suse.de> Cc: Jaroslav Kysela <perex@perex.cz> Cc: Masahiro Yamada <masahiroy@kernel.org> Cc: Nathan Chancellor <nathan@kernel.org> Cc: Nick Desaulniers <ndesaulniers@google.com> Cc: Nicolas Schier <nicolas@fjasle.eu> Cc: linux-kbuild@vger.kernel.org Cc: alsa-devel@alsa-project.org Reviewed-by: Masahiro Yamada <masahiroy@kernel.org> Signed-off-by: Richard Weinberger <richard@nod.at>
77 lines
2.7 KiB
Makefile
77 lines
2.7 KiB
Makefile
# SPDX-License-Identifier: GPL-2.0
|
|
#
|
|
# Copyright (C) 2000, 2002, 2003 Jeff Dike (jdike@karaya.com)
|
|
#
|
|
|
|
# pcap is broken in 2.5 because kbuild doesn't allow pcap.a to be linked
|
|
# in to pcap.o
|
|
|
|
slip-objs := slip_kern.o slip_user.o
|
|
slirp-objs := slirp_kern.o slirp_user.o
|
|
daemon-objs := daemon_kern.o daemon_user.o
|
|
vector-objs := vector_kern.o vector_user.o vector_transports.o
|
|
umcast-objs := umcast_kern.o umcast_user.o
|
|
net-objs := net_kern.o net_user.o
|
|
mconsole-objs := mconsole_kern.o mconsole_user.o
|
|
hostaudio-objs := hostaudio_kern.o
|
|
ubd-objs := ubd_kern.o ubd_user.o
|
|
port-objs := port_kern.o port_user.o
|
|
harddog-objs := harddog_kern.o
|
|
harddog-builtin-$(CONFIG_UML_WATCHDOG) := harddog_user.o harddog_user_exp.o
|
|
rtc-objs := rtc_kern.o rtc_user.o
|
|
|
|
LDFLAGS_pcap.o = $(shell $(CC) $(KBUILD_CFLAGS) -print-file-name=libpcap.a)
|
|
|
|
LDFLAGS_vde.o = $(shell $(CC) $(CFLAGS) -print-file-name=libvdeplug.a)
|
|
|
|
targets := pcap_kern.o pcap_user.o vde_kern.o vde_user.o
|
|
|
|
$(obj)/pcap.o: $(obj)/pcap_kern.o $(obj)/pcap_user.o
|
|
$(LD) -r -dp -o $@ $^ $(ld_flags)
|
|
|
|
$(obj)/vde.o: $(obj)/vde_kern.o $(obj)/vde_user.o
|
|
$(LD) -r -dp -o $@ $^ $(ld_flags)
|
|
|
|
#XXX: The call below does not work because the flags are added before the
|
|
# object name, so nothing from the library gets linked.
|
|
#$(call if_changed,ld)
|
|
|
|
# When the above is fixed, don't forget to add this too!
|
|
#targets += $(obj)/pcap.o
|
|
|
|
obj-y := stdio_console.o fd.o chan_kern.o chan_user.o line.o
|
|
obj-$(CONFIG_SSL) += ssl.o
|
|
obj-$(CONFIG_STDERR_CONSOLE) += stderr_console.o
|
|
|
|
obj-$(CONFIG_UML_NET_SLIP) += slip.o slip_common.o
|
|
obj-$(CONFIG_UML_NET_SLIRP) += slirp.o slip_common.o
|
|
obj-$(CONFIG_UML_NET_DAEMON) += daemon.o
|
|
obj-$(CONFIG_UML_NET_VECTOR) += vector.o
|
|
obj-$(CONFIG_UML_NET_VDE) += vde.o
|
|
obj-$(CONFIG_UML_NET_MCAST) += umcast.o
|
|
obj-$(CONFIG_UML_NET_PCAP) += pcap.o
|
|
obj-$(CONFIG_UML_NET) += net.o
|
|
obj-$(CONFIG_MCONSOLE) += mconsole.o
|
|
obj-$(CONFIG_MMAPPER) += mmapper_kern.o
|
|
obj-$(CONFIG_BLK_DEV_UBD) += ubd.o
|
|
obj-$(CONFIG_UML_SOUND) += hostaudio.o
|
|
obj-$(CONFIG_NULL_CHAN) += null.o
|
|
obj-$(CONFIG_PORT_CHAN) += port.o
|
|
obj-$(CONFIG_PTY_CHAN) += pty.o
|
|
obj-$(CONFIG_TTY_CHAN) += tty.o
|
|
obj-$(CONFIG_XTERM_CHAN) += xterm.o xterm_kern.o
|
|
obj-$(CONFIG_UML_WATCHDOG) += harddog.o
|
|
obj-y += $(harddog-builtin-y) $(harddog-builtin-m)
|
|
obj-$(CONFIG_BLK_DEV_COW_COMMON) += cow_user.o
|
|
obj-$(CONFIG_UML_RANDOM) += random.o
|
|
obj-$(CONFIG_VIRTIO_UML) += virtio_uml.o
|
|
obj-$(CONFIG_UML_RTC) += rtc.o
|
|
obj-$(CONFIG_UML_PCI_OVER_VIRTIO) += virt-pci.o
|
|
|
|
# pcap_user.o must be added explicitly.
|
|
USER_OBJS := fd.o null.o pty.o tty.o xterm.o slip_common.o pcap_user.o vde_user.o vector_user.o
|
|
CFLAGS_null.o = -DDEV_NULL=$(DEV_NULL_PATH)
|
|
|
|
CFLAGS_xterm.o += '-DCONFIG_XTERM_CHAN_DEFAULT_EMULATOR="$(CONFIG_XTERM_CHAN_DEFAULT_EMULATOR)"'
|
|
|
|
include $(srctree)/arch/um/scripts/Makefile.rules
|