[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#392592: a simpler patch



Here's a patch that simply uses hardcoded definitions instead of
doing the dynamic tests that require architecture-specific scripts.

I don't particularly like this approach because it restricts
portability and diverts from upstream. But, it is simpler, and this
really needs to be fixed somehow before etch (along with a rebuild of
linux-modules-extra-2.6), so I'm willing to live with it if my other
patch is deemed unacceptable.

Bastian: you were the only one with a negative remark[1] about my
previous approach. I'm really looking for some feedback from you
about my first patch in this report (which modifies
linux-kbuild-2.6). Your comment[1] was insufficient for me to
understand the flaw of that approach. I'd really like to avoid a
commit/revert cycle by coming to a consensus via e-mail first.

[1] http://lists.debian.org/debian-kernel/2006/10/msg00463.html

--- linux-source-2.6.18/arch/ia64/Makefile.orig	2007-01-02 14:40:50.000000000 -0700
+++ linux-source-2.6.18/arch/ia64/Makefile	2007-01-02 15:01:37.000000000 -0700
@@ -28,8 +28,12 @@
 		   -falign-functions=32 -frename-registers -fno-optimize-sibling-calls
 CFLAGS_KERNEL	:= -mconstant-gp
 
-GAS_STATUS	= $(shell $(srctree)/arch/ia64/scripts/check-gas "$(CC)" "$(OBJDUMP)")
-CPPFLAGS += $(shell $(srctree)/arch/ia64/scripts/toolchain-flags "$(CC)" "$(OBJDUMP)" "$(READELF)")
+# Hardcoded for Debian, to avoid introducing arch-specific scripts into
+# the headers package. See #392592 for details.
+#GAS_STATUS	= $(shell $(srctree)/arch/ia64/scripts/check-gas "$(CC)" "$(OBJDUMP)")
+#CPPFLAGS += $(shell $(srctree)/arch/ia64/scripts/toolchain-flags "$(CC)" "$(OBJDUMP)" "$(READELF)")
+GAS_STATUS	= good
+CPPFLAGS += -DHAVE_WORKING_TEXT_ALIGN -DHAVE_MODEL_SMALL_ATTRIBUTE -DHAVE_SERIALIZE_DIRECTIVE
 
 ifeq ($(GAS_STATUS),buggy)
 $(error Sorry, you need a newer version of the assember, one that is built from	\
@@ -77,7 +81,8 @@
 	$(Q)$(MAKE) $(build)=$(boot) $@
 
 unwcheck: vmlinux
-	-$(Q)READELF=$(READELF) $(srctree)/arch/ia64/scripts/unwcheck.py $<
+#	-$(Q)READELF=$(READELF) $(srctree)/arch/ia64/scripts/unwcheck.py $<
+	@echo Warning: unwcheck test skipped to workaround missing arch scripts, see \#392592
 
 archclean:
 	$(Q)$(MAKE) $(clean)=$(boot)


-- 
dann frazier | HP Open Source and Linux Organization



Reply to: