* Use the "right" way to enable these packages on certain platforms only

git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@8499 33e552b5-05e3-0310-8538-816dae2090ed

9 files changed, 11 insertions, 36 deletions

diff --git a/rules/grub.make b/rules/grub.make
index c44b0dae6..d3a7871db 100644
--- a/rules/grub.make
+++ b/rules/grub.make
@@ -11,9 +11,7 @@
 #
 # We provide this package
 #
-ifdef PTXCONF_ARCH_X86
-PACKAGES-$(PTXCONF_GRUB) += grub
-endif
+PACKAGES-$(PTXCONF_ARCH_X86)-$(PTXCONF_GRUB) += grub
 
 #
 # Paths and names
diff --git a/rules/libx86.make b/rules/libx86.make
index ab51d3f71..28e7285f1 100644
--- a/rules/libx86.make
+++ b/rules/libx86.make
@@ -12,7 +12,8 @@
 #
 # We provide this package
 #
-PACKAGES-$(PTXCONF_LIBX86) += libx86
+PACKAGES-$(PTXCONF_ARCH_X86)-$(PTXCONF_LIBX86) += libx86
+PACKAGES-$(PTXCONF_ARCH_PPC)-$(PTXCONF_LIBX86) += libx86
 
 #
 # Paths and names
@@ -54,16 +55,9 @@ $(STATEDIR)/libx86.extract:
 LIBX86_PATH	:= PATH=$(CROSS_PATH)
 LIBX86_ENV 	:= $(CROSS_ENV)
 
-# enable build un supported platforms only
-ifdef ARCH_X86
-LIBX86_BUILD = 1
-else
+ifndef ARCH_X86
 # use emulator on non x86 architectures
 LIBX86_ENV += BACKEND=x86emu
-
-ifdef ARCH_PPC
-LIBX86_BUILD = 1
-endif
 endif
 
 #
@@ -85,9 +79,7 @@ $(STATEDIR)/libx86.prepare:
 
 $(STATEDIR)/libx86.compile:
 	@$(call targetinfo, $@)
-ifdef LIBX86_BUILD
 	cd $(LIBX86_DIR) && $(LIBX86_ENV) $(LIBX86_PATH) $(MAKE) $(PARALLELMFLAGS)
-endif
 	@$(call touch, $@)
 
 # ----------------------------------------------------------------------------
@@ -96,9 +88,7 @@ endif
 
 $(STATEDIR)/libx86.install:
 	@$(call targetinfo, $@)
-ifdef LIBX86_BUILD
 	@$(call install, LIBX86)
-endif
 	@$(call touch, $@)
 
 # ----------------------------------------------------------------------------
@@ -108,7 +98,6 @@ endif
 $(STATEDIR)/libx86.targetinstall:
 	@$(call targetinfo, $@)
 
-ifdef LIBX86_BUILD
 	@$(call install_init, libx86)
 	@$(call install_fixup, libx86,PACKAGE,libx86)
 	@$(call install_fixup, libx86,PRIORITY,optional)
@@ -122,7 +111,6 @@ ifdef LIBX86_BUILD
 	@$(call install_link, libx86, libx86.so.1, /usr/lib/libx86.so)
 
 	@$(call install_finish, libx86)
-endif
 
 	@$(call touch, $@)
 
diff --git a/rules/madwifi.make b/rules/madwifi.make
index 23e028f17..177745a62 100644
--- a/rules/madwifi.make
+++ b/rules/madwifi.make
@@ -22,9 +22,7 @@
 #
 #
 
-ifdef PTXCONF_ARCH_X86
-PACKAGES-$(PTXCONF_MADWIFI) += madwifi
-endif
+PACKAGES-$(PTXCONF_ARCH_X86)-$(PTXCONF_MADWIFI) += madwifi
 
 #
 # Paths and names
diff --git a/rules/mplayer.make b/rules/mplayer.make
index 92a337684..8306346d1 100644
--- a/rules/mplayer.make
+++ b/rules/mplayer.make
@@ -12,7 +12,7 @@
 #
 # We provide this package
 #
-PACKAGES-$(PTXCONF_MPLAYER) += mplayer
+PACKAGES-$(PTXCONF_ARCH_X86)-$(PTXCONF_MPLAYER) += mplayer
 
 #
 # Paths and names
diff --git a/rules/usplash.make b/rules/usplash.make
index 0124380bb..57be43e17 100644
--- a/rules/usplash.make
+++ b/rules/usplash.make
@@ -12,7 +12,8 @@
 #
 # We provide this package
 #
-PACKAGES-$(PTXCONF_USPLASH) += usplash
+PACKAGES-$(PTXCONF_ARCH_X86)-$(PTXCONF_USPLASH) += usplash
+PACKAGES-$(PTXCONF_ARCH_PPC)-$(PTXCONF_USPLASH) += usplash
 
 #
 # Paths and names
@@ -70,13 +71,10 @@ USPLASH_AUTOCONF := $(CROSS_AUTOCONF_USR) \
 
 $(STATEDIR)/usplash.prepare:
 	@$(call targetinfo, $@)
-# LIBX86_BUILD is not built on all architectures
-ifdef LIBX86_BUILD
 	@$(call clean, $(USPLASH_DIR)/config.cache)
 	cd $(USPLASH_DIR) && \
 		$(USPLASH_PATH) $(USPLASH_ENV) \
 		sh ./configure $(USPLASH_AUTOCONF)
-endif
 	@$(call touch, $@)
 
 # ----------------------------------------------------------------------------
@@ -87,12 +85,10 @@ usplash_compile: $(STATEDIR)/usplash.compile
 
 $(STATEDIR)/usplash.compile:
 	@$(call targetinfo, $@)
-ifdef LIBX86_BUILD
 	cd $(USPLASH_DIR) && \
 		$(USPLASH_ENV) $(USPLASH_PATH) \
 		$(MAKE) \
 		$(PARALLELMFLAGS_BROKEN)
-endif
 	@$(call touch, $@)
 
 # ----------------------------------------------------------------------------
@@ -103,9 +99,7 @@ usplash_install: $(STATEDIR)/usplash.install
 
 $(STATEDIR)/usplash.install:
 	@$(call targetinfo, $@)
-ifdef LIBX86_BUILD
 	@$(call install, USPLASH)
-endif
 	@$(call touch, $@)
 
 # ----------------------------------------------------------------------------
@@ -117,7 +111,6 @@ usplash_targetinstall: $(STATEDIR)/usplash.targetinstall
 $(STATEDIR)/usplash.targetinstall:
 	@$(call targetinfo, $@)
 
-ifdef LIBX86_BUILD
 	@$(call install_init, usplash)
 	@$(call install_fixup, usplash,PACKAGE,usplash)
 	@$(call install_fixup, usplash,PRIORITY,optional)
@@ -135,7 +128,6 @@ ifdef LIBX86_BUILD
 	@$(call install_link, usplash, /lib/libusplash.so.0, /lib/libusplash.so)
 
 	@$(call install_finish, usplash)
-endif
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-driver-video-ati.in b/rules/xorg-driver-video-ati.in
index 4cc2a438e..d1919c73f 100644
--- a/rules/xorg-driver-video-ati.in
+++ b/rules/xorg-driver-video-ati.in
@@ -3,7 +3,6 @@
 menuconfig XORG_DRIVER_VIDEO_ATI
 	tristate
 	depends on XORG_DRIVER_VIDEO
-	depends on ARCH_X86 || ARCH_POWERPC
 	select XORG_SERVER
 	select XORG_PROTO_X
 	select XORG_PROTO_FONTS
diff --git a/rules/xorg-driver-video-ati.make b/rules/xorg-driver-video-ati.make
index 0c8971477..0f4425b8d 100644
--- a/rules/xorg-driver-video-ati.make
+++ b/rules/xorg-driver-video-ati.make
@@ -12,7 +12,8 @@
 #
 # We provide this package
 #
-PACKAGES-$(PTXCONF_XORG_DRIVER_VIDEO_ATI) += xorg-driver-video-ati
+PACKAGES-$(PTXCONF_ARCH_X86)-$(PTXCONF_XORG_DRIVER_VIDEO_ATI) += xorg-driver-video-ati
+PACKAGES-$(PTXCONF_ARCH_PPC)-$(PTXCONF_XORG_DRIVER_VIDEO_ATI) += xorg-driver-video-ati
 
 #
 # Paths and names
diff --git a/rules/xorg-driver-video-i810.in b/rules/xorg-driver-video-i810.in
index adf489a8c..5dc71ec16 100644
--- a/rules/xorg-driver-video-i810.in
+++ b/rules/xorg-driver-video-i810.in
@@ -3,7 +3,6 @@
 menuconfig XORG_DRIVER_VIDEO_I810
 	tristate
 	depends on XORG_DRIVER_VIDEO
-	depends on ARCH_X86
 	select XORG_SERVER
 	select XORG_PROTO_X
 	select XORG_PROTO_FONTS
diff --git a/rules/xorg-driver-video-i810.make b/rules/xorg-driver-video-i810.make
index 2fd075ed6..b1f02a06e 100644
--- a/rules/xorg-driver-video-i810.make
+++ b/rules/xorg-driver-video-i810.make
@@ -12,7 +12,7 @@
 #
 # We provide this package
 #
-PACKAGES-$(PTXCONF_XORG_DRIVER_VIDEO_I810) += xorg-driver-video-i810
+PACKAGES-$(PTXCONF_ARCH_X86)-$(PTXCONF_XORG_DRIVER_VIDEO_I810) += xorg-driver-video-i810
 
 #
 # Paths and names