Add helper that detects which LTS xorg version is installed

2 files changed, 28 insertions, 62 deletions

diff --git a/remote/modules/xorg/xorg.conf.ubuntu b/remote/modules/xorg/xorg.conf.ubuntu
index 1712f520..b175d9c7 100644
--- a/remote/modules/xorg/xorg.conf.ubuntu
+++ b/remote/modules/xorg/xorg.conf.ubuntu
@@ -1,36 +1,36 @@
 REQUIRED_CONTENT_PACKAGES="	
-			xserver-xorg
-			xserver-xorg-core
+			xserver-xorg$UBUNTU_XORG_PKG_SUFFIX
+			xserver-xorg-core$UBUNTU_XORG_PKG_SUFFIX
 			libgl1-mesa-dri
 			libgl1-mesa-glx
 			xkb-data
 			x11-xkb-utils
 			x11-xserver-utils
-			xserver-xorg-input-evdev
-			xserver-xorg-input-mouse
-			xserver-xorg-input-vmmouse
-			xserver-xorg-video-intel
-			xserver-xorg-video-ati            
-			xserver-xorg-video-vesa
-			xserver-xorg-video-mga            
-			xserver-xorg-video-sis            
-			xserver-xorg-video-vmware
-			xserver-xorg-video-fbdev          
-			xserver-xorg-video-radeon         
-			xserver-xorg-video-sisusb         
-			xserver-xorg-video-nouveau        
-			@xserver-xorg-video-openchrome     
-			@xserver-xorg-video-savage         
-			@xserver-xorg-video-trident
-			@xserver-xorg-video-mach64         
-			@xserver-xorg-video-qxl            
-			@xserver-xorg-video-siliconmotion  
-			@xserver-xorg-video-cirrus         
-			@xserver-xorg-video-r128           
-			@xserver-xorg-video-neomagic       
-			@xserver-xorg-video-geode          
-			@xserver-xorg-video-s3             
-			@xserver-xorg-video-tdfx
+			xserver-xorg-input-evdev$UBUNTU_XORG_PKG_SUFFIX
+			xserver-xorg-input-mouse$UBUNTU_XORG_PKG_SUFFIX
+			xserver-xorg-input-vmmouse$UBUNTU_XORG_PKG_SUFFIX
+			xserver-xorg-video-intel$UBUNTU_XORG_PKG_SUFFIX
+			xserver-xorg-video-ati$UBUNTU_XORG_PKG_SUFFIX
+			xserver-xorg-video-vesa$UBUNTU_XORG_PKG_SUFFIX
+			xserver-xorg-video-mga$UBUNTU_XORG_PKG_SUFFIX
+			xserver-xorg-video-sis$UBUNTU_XORG_PKG_SUFFIX
+			xserver-xorg-video-vmware$UBUNTU_XORG_PKG_SUFFIX
+			xserver-xorg-video-fbdev$UBUNTU_XORG_PKG_SUFFIX
+			xserver-xorg-video-radeon$UBUNTU_XORG_PKG_SUFFIX
+			xserver-xorg-video-sisusb$UBUNTU_XORG_PKG_SUFFIX
+			xserver-xorg-video-nouveau$UBUNTU_XORG_PKG_SUFFIX
+			@xserver-xorg-video-openchrome$UBUNTU_XORG_PKG_SUFFIX
+			@xserver-xorg-video-savage$UBUNTU_XORG_PKG_SUFFIX
+			@xserver-xorg-video-trident$UBUNTU_XORG_PKG_SUFFIX
+			@xserver-xorg-video-mach64$UBUNTU_XORG_PKG_SUFFIX
+			@xserver-xorg-video-qxl$UBUNTU_XORG_PKG_SUFFIX
+			@xserver-xorg-video-siliconmotion$UBUNTU_XORG_PKG_SUFFIX
+			@xserver-xorg-video-cirrus$UBUNTU_XORG_PKG_SUFFIX
+			@xserver-xorg-video-r128$UBUNTU_XORG_PKG_SUFFIX
+			@xserver-xorg-video-neomagic$UBUNTU_XORG_PKG_SUFFIX
+			@xserver-xorg-video-geode$UBUNTU_XORG_PKG_SUFFIX
+			@xserver-xorg-video-s3$UBUNTU_XORG_PKG_SUFFIX
+			@xserver-xorg-video-tdfx$UBUNTU_XORG_PKG_SUFFIX
 "
 REQUIRED_BINARIES+="	
 			xkbcomp 
diff --git a/remote/setup_target b/remote/setup_target
index c19113df..9db5ba20 100755
--- a/remote/setup_target
+++ b/remote/setup_target
@@ -58,41 +58,7 @@ EXPORT_DIR="/export/build"
 PROCESSED_MODULES=""
 
 initial_checks () {
-	# Set up distribution and package management
-	# Lowercase distributor ID is what we use as the general distribution name
-	SYS_DISTRIBUTION=$(lsb_release -is | tolower | sed -r 's/[^a-z0-9]//g;s/project$//g;s/scientificsl$/scientific/g')
-	# Then determine packet manager
-	case "$SYS_DISTRIBUTION" in
-	ubuntu|debian)
-		PACKET_MANAGER="apt"
-		PACKET_HANDLER="dpkg"
-		;;
-	opensuse)
-		PACKET_MANAGER="zypper"
-		PACKET_HANDLER="rpm"
-		;;
-	scientific)
-		PACKET_MANAGER="yum"
-		PACKET_HANDLER="rpm"
-		;;
-	*)
-		perror "Unknown Distribution: $SYS_DISTRIBUTION - Please specify its packet manager in remote/setup_target"
-		;;
-	esac
-	# Get version - we mangle this quite a bit. first make sure it has no spaces, then split version at period (.), underscore (_) and dash (-)
-	SYS_VERSION=$(lsb_release -rs | tolower)
-	local VERSION=$(echo $SYS_VERSION | sed -r 's/\s//g;s/[\._]/ /g;s/-//g')
-	local STRTMP=""
-	PRINT_SYS_VERSIONS="*.conf.$SYS_DISTRIBUTION"
-	SYS_VERSIONS="$SYS_DISTRIBUTION"
-	for PART in $VERSION; do
-		[ -z "$PART" ] && continue
-		STRTMP+=".$PART"
-		SYS_VERSIONS="${SYS_DISTRIBUTION}${STRTMP} $SYS_VERSIONS"
-		PRINT_SYS_VERSIONS="*.conf.${SYS_DISTRIBUTION}${STRTMP} $PRINT_SYS_VERSIONS"
-	done
-	pinfo "Config source order: *.conf first, then the first one of these (if found)"
-	pinfo "$PRINT_SYS_VERSIONS"
+	detect_distribution
 }
 
 #