Author: daniel
Date: 2003-05-27 22:29:06 -0500 (Tue, 27 May 2003)
New Revision: 82
Modified:
branches/4.3.0/sid/debian/rules
branches/4.3.0/sid/debian/scripts/vars.s390
Log:
Move DRM stuff to be in !NOT_BUILDING_XF86_SERVER, not !NOT_BUILDING_X_SERVER,
and declare that s390 builds no servers whatsoever, not just not building the
xf86 server, hopefully fixing s390 FTBFS.
Modified: branches/4.3.0/sid/debian/scripts/vars.s390
==============================================================================
--- branches/4.3.0/sid/debian/scripts/vars.s390 2003-05-27 23:57:53 UTC (rev 81)
+++ branches/4.3.0/sid/debian/scripts/vars.s390 2003-05-28 03:29:06 UTC (rev 82)
@@ -2,4 +2,4 @@
#
# This file gets included by both debian/rules (make) AND the scripts in
# debian/scripts (Bourne shell).
-NOT_BUILDING_XF86_SERVER=1
+NOT_BUILDING_X_SERVER=1
Modified: branches/4.3.0/sid/debian/rules
==============================================================================
--- branches/4.3.0/sid/debian/rules 2003-05-27 23:57:53 UTC (rev 81)
+++ branches/4.3.0/sid/debian/rules 2003-05-28 03:29:06 UTC (rev 82)
@@ -277,6 +277,17 @@
mkdir -p $(DEBTREEDIR)/etc/X11/cursors
install -m 644 debian/local/cursors/*.theme
$(DEBTREEDIR)/etc/X11/cursors
rm -f $(DEBTREEDIR)/usr/X11R6/lib/X11/icons/default/index.theme
+
+ # Create the xlibmesa-drm-src package.
+ mkdir $(DEBTREEDIR)/usr/src
+ mkdir -p $(DRM_DST_DIR)
+ -cp -R $(DRM_SRC_DIR)/* $(DRM_DST_DIR)
+ $(M4) -DOURVERSION="$(SOURCE_VERSION)"
$(DRM_DST_DIR)/debian/module-changelog.m4 > $(DRM_DST_DIR)/debian/changelog.m4
+ rm $(DRM_DST_DIR)/debian/module-changelog.m4
+ chmod +x $(DRM_DST_DIR)/debian/rules
+ -cp -L
build-tree/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/*
$(DRM_DST_DIR)/
+ rm $(DRM_DST_DIR)/Makefile $(DRM_DST_DIR)/Imakefile
$(DRM_DST_DIR)/Makefile.kernel
+ cd $(DRM_SRC_DIR) && tar -zcvf
$(DEBTREEDIR)/usr/src/xlibmesa-drm.tar.gz modules/xlibmesa-drm
endif
# remove the upstream symlink X -> XFree86
rm -f $(DEBTREEDIR)/usr/X11R6/bin/X
@@ -290,17 +301,6 @@
# install the Python/GNOME based configlet
install -m 755 -d $(DEBTREEDIR)/usr/share/configlets/xserver-common
install -m 644 debian/local/dexlet/*
$(DEBTREEDIR)/usr/share/configlets/xserver-common
-
- # Create the xlibmesa-drm-src package.
- mkdir $(DEBTREEDIR)/usr/src
- mkdir -p $(DRM_DST_DIR)
- -cp -R $(DRM_SRC_DIR)/* $(DRM_DST_DIR)
- $(M4) -DOURVERSION="$(SOURCE_VERSION)"
$(DRM_DST_DIR)/debian/module-changelog.m4 > $(DRM_DST_DIR)/debian/changelog.m4
- rm $(DRM_DST_DIR)/debian/module-changelog.m4
- chmod +x $(DRM_DST_DIR)/debian/rules
- -cp -L
build-tree/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/*
$(DRM_DST_DIR)/
- rm $(DRM_DST_DIR)/Makefile $(DRM_DST_DIR)/Imakefile
$(DRM_DST_DIR)/Makefile.kernel
- cd $(DRM_SRC_DIR) && tar -zcvf
$(DEBTREEDIR)/usr/src/xlibmesa-drm.tar.gz modules/xlibmesa-drm
endif
# other stuff
