Splited package and renamed it

4 files changed, 161 insertions, 32 deletions

diff --git a/.SRCINFO b/.SRCINFO
index cd872aadfa77..e0c33f382966 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
-pkgbase = quartus-free
-	pkgdesc = Quartus Prime Lite Edition design software for Altera FPGA's
+pkgbase = intel_fpga_lite
+	pkgdesc = Quartus Prime Lite Edition design software for Intel FPGA's. Split packages
 	pkgver = 19.1.0.670
 	pkgrel = 1
 	url = http://fpgasoftware.intel.com/?edition=lite
@@ -34,13 +34,49 @@ pkgbase = quartus-free
 	source = http://download.altera.com/akdlm/software/acdsinst/19.1std/670/ib_tar/Quartus-lite-19.1.0.670-linux.tar
 	source = quartus.sh
 	source = quartus.desktop
+	source = modelsim-ase.sh
 	source = modelsim-ase.desktop
 	source = 51-usbblaster.rules
 	sha256sums = 3546e90f6496b17c3c3e3e8582a3991940ad73ed112740428864460cfab6e40a
-	sha256sums = 2a3d61e6f01aa16c9d3ddd40e9741b9fd080496db5437530b4e38faf6771c1ed
+	sha256sums = 16206c08cd04fb02318a20e053346c68e77275b324ca24cfb3da64b03420ab3c
 	sha256sums = f8ba2a84c6f7551bb4ab62d17f77e2814c70871ddb15f0276f1bf89cc6c674b8
+	sha256sums = 363be8b0656b56f92c34ac0581a8a0f3bb1edaa9da361f50d1e60ec3334c13a7
 	sha256sums = a37738de447c50ca7bfe856466bd9567850ccf45ac6c3f0a6e63ef5bb863645f
 	sha256sums = dd9d33fa2698a0ec11ae86f4508f77e2e12bf4a21224f5b16640bc41d6c0999b
 
-pkgname = quartus-free
+pkgname = intel_fpga_lite-license
+
+pkgname = intel_fpga_lite-ip
+	depends = intel_fpga_lite-license=19.1.0.670-1
+
+pkgname = intel_fpga_lite-modelsim_ase
+	depends = intel_fpga_lite-license=19.1.0.670-1
+
+pkgname = intel_fpga_lite-nios2eds
+	depends = intel_fpga_lite-license=19.1.0.670-1
+
+pkgname = intel_fpga_lite-quartus
+	depends = intel_fpga_lite-license=19.1.0.670-1
+	depends = intel_fpga_lite-ip=19.1.0.670-1
+
+pkgname = intel_fpga_lite-quartus-help
+	depends = intel_fpga_lite-quartus=19.1.0.670-1
+
+pkgname = intel_fpga_lite-quartus-arria_lite
+	depends = intel_fpga_lite-quartus=19.1.0.670-1
+
+pkgname = intel_fpga_lite-quartus-cyclone
+	depends = intel_fpga_lite-quartus=19.1.0.670-1
+
+pkgname = intel_fpga_lite-quartus-cyclone10lp
+	depends = intel_fpga_lite-quartus=19.1.0.670-1
+
+pkgname = intel_fpga_lite-quartus-cyclonev
+	depends = intel_fpga_lite-quartus=19.1.0.670-1
+
+pkgname = intel_fpga_lite-quartus-max
+	depends = intel_fpga_lite-quartus=19.1.0.670-1
+
+pkgname = intel_fpga_lite-quartus-max10
+	depends = intel_fpga_lite-quartus=19.1.0.670-1
 
diff --git a/PKGBUILD b/PKGBUILD
index 33b168657747..75406de9ae9b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,10 +1,12 @@
-# Maintainer:  Gabriel Souza Franco <Z2FicmllbGZyYW5jb3NvdXphQGdtYWlsLmNvbQ==>
+# Maintainer: Nico Rumpeltin <$forename at $surname dot de>
+# Contributor: Gabriel Souza Franco <Z2FicmllbGZyYW5jb3NvdXphQGdtYWlsLmNvbQ==>
 # Contributor: Matthias Blaicher <matthias at blaicher dot com>
 # Contributor: Danny Dutton <duttondj@vt.edu>
 #
 # NOTE: If you plan on using the usbblaster make sure you are member of the plugdev group.
 #
-pkgname=quartus-free
+pkgbase=intel_fpga_lite
+pkgname=(${pkgbase}-{license,ip,modelsim_ase,nios2eds,quartus,quartus-help,quartus-arria_lite,quartus-cyclone,quartus-cyclone10lp,quartus-cyclonev,quartus-max,quartus-max10})
 _mainver=19.1
 # Keep dot in _patchver
 _patchver=.0
@@ -12,12 +14,12 @@ _buildver=670
 _basever=.0.670
 pkgver=${_mainver}${_patchver}.${_buildver}
 pkgrel=1
-pkgdesc="Quartus Prime Lite Edition design software for Altera FPGA's"
+pkgdesc="Quartus Prime Lite Edition design software for Intel FPGA's. Split packages"
 arch=('x86_64')
 url="http://fpgasoftware.intel.com/?edition=lite"
 license=('custom')
 
-_alteradir="/opt/altera/${_mainver}"
+_inteldir="/opt/intel_fpga_lite/${_mainver}"
 
 # According to the installer script, these dependencies are needed for the installer
 depends=('lib32-expat' 'lib32-fontconfig' 'lib32-freetype2' 'lib32-glibc'
@@ -29,40 +31,38 @@ depends=('lib32-expat' 'lib32-fontconfig' 'lib32-freetype2' 'lib32-glibc'
 makedepends=('patchelf')
 
 source=("http://download.altera.com/akdlm/software/acdsinst/${_mainver}std${_patchver/.0/}/${_buildver}/ib_tar/Quartus-lite-${pkgver}-linux.tar"
-        'quartus.sh' 'quartus.desktop' 'modelsim-ase.desktop' '51-usbblaster.rules')
+        'quartus.sh' 'quartus.desktop' 'modelsim-ase.sh' 'modelsim-ase.desktop' '51-usbblaster.rules')
 sha256sums=('3546e90f6496b17c3c3e3e8582a3991940ad73ed112740428864460cfab6e40a'
-            '2a3d61e6f01aa16c9d3ddd40e9741b9fd080496db5437530b4e38faf6771c1ed'
+            '16206c08cd04fb02318a20e053346c68e77275b324ca24cfb3da64b03420ab3c'
             'f8ba2a84c6f7551bb4ab62d17f77e2814c70871ddb15f0276f1bf89cc6c674b8'
+            '363be8b0656b56f92c34ac0581a8a0f3bb1edaa9da361f50d1e60ec3334c13a7'
             'a37738de447c50ca7bfe856466bd9567850ccf45ac6c3f0a6e63ef5bb863645f'
             'dd9d33fa2698a0ec11ae86f4508f77e2e12bf4a21224f5b16640bc41d6c0999b')
 
 options=(!strip !debug) # Stripping will takes ages, I'd avoid it
-PKGEXT=".pkg.tar" # Same for compression
 
-package() {
+build() {
+    rm -rf "${srcdir}/install"
+    
     echo "Notice: Requires around 24GB of free space during package building!"
     echo "Notice: The package file also requires around 16GB of free space"
     echo "Extracting install binaries and scripts from downloaded tar..."
 
-    DISPLAY="" bash ./setup.sh --mode unattended --unattendedmodeui none --accept_eula 1 --installdir "${pkgdir}${_alteradir}"
-
-    # Remove uninstaller and install logs since we have a working package management
-    rm -r "${pkgdir}${_alteradir}/uninstall"
-    rm -r "${pkgdir}${_alteradir}/logs"
-
+    DISPLAY="" bash ./setup.sh --mode unattended --unattendedmodeui none --accept_eula 1 --installdir "${srcdir}/install"
+    
     # Remove useless unzip binaries
-    find "${pkgdir}${_alteradir}" \( -name "unzip" -or -name "unzip32" \) -delete
+    find "${srcdir}/install" \( -name "unzip" -or -name "unzip32" \) -delete
 
     # Fix interpreter for the license manager
     for prog in quartus/linux64/{lmutil,lmgrd}; do
-        patchelf --set-interpreter /lib64/ld-linux-x86-64.so.2 "${pkgdir}${_alteradir}/${prog}"
+        patchelf --set-interpreter /lib64/ld-linux-x86-64.so.2 "${srcdir}/install/${prog}"
     done
     for prog in modelsim_ase/linuxaloem/{mgls/bin/,}{lmutil,lmgrd}; do
-        patchelf --set-interpreter /lib/ld-linux.so.2 "${pkgdir}${_alteradir}/${prog}"
+        patchelf --set-interpreter /lib/ld-linux.so.2 "${srcdir}/install/${prog}"
     done
 
     # Fix world writable permissions
-    find "${pkgdir}${_alteradir}/nios2eds/documents" -perm -o+w -exec chmod go-w {} \+
+    find "${srcdir}/install/nios2eds/documents" -perm -o+w -exec chmod go-w {} \+
 
     # Replace altera directory in integration files
     sed -i "s,_alteradir,${_alteradir},g" quartus.sh
@@ -71,25 +71,116 @@ package() {
     
     # Fix modelsim startup code for Linux Kernel >=4.0
     # see https://wiki.archlinux.org/index.php/Altera_Design_Software
-    sed -i 's,linux_rh60,linux,g' "${pkgdir}${_alteradir}/modelsim_ase/vco"
+    sed -i 's,linux_rh60,linux,g' "${srcdir}/install/modelsim_ase/vco"
 
     # Modelsim bundles a copy of tkImg linked to old versions of libs
     # Replace by system version
-    rm -rf "${pkgdir}${_alteradir}/modelsim_ase/linuxaloem/Img1.3"
-    ln -s /usr/lib32/Img[0-9]* "${pkgdir}${_alteradir}/modelsim_ase/linuxaloem/Img"
+    rm -rf "${srcdir}/install/modelsim_ase/linuxaloem/Img1.3"
+    ln -s /usr/lib32/Img[0-9]* "${srcdir}/install/modelsim_ase/linuxaloem/Img"
 
     # Remove pkgdir reference in sopc_builder
-    sed -i "s,${pkgdir},,g" "${pkgdir}${_alteradir}/quartus/sopc_builder/.sopc_builder"
+    sed -i "s,${pkgdir},,g" "${srcdir}/install/quartus/sopc_builder/.sopc_builder"
 
     # Suppress spurious warning about linux-gate.so.1
-    sed -i '/msg_system/a suppress = 3116' "${pkgdir}${_alteradir}/modelsim_ase/modelsim.ini"
+    sed -i '/msg_system/a suppress = 3116' "${srcdir}/install/modelsim_ase/modelsim.ini"
+
+    # mv help
+    mkdir -p "${srcdir}/install/help/"
+    mv "${srcdir}/install/quartus/common/help/tutorial" "${srcdir}/install/help/"
+    mv "${srcdir}/install/quartus/common/help/webhelp" "${srcdir}/install/help/"
+
+    # mv devices
+    mkdir -p "${srcdir}/install/devinfo"
+    mv "${srcdir}/install/quartus/common/devinfo/arriaii" "${srcdir}/install/devinfo/"
+    mv "${srcdir}/install/quartus/common/devinfo/cycloneive" "${srcdir}/install/devinfo/"
+    mv "${srcdir}/install/quartus/common/devinfo/cycloneivgx" "${srcdir}/install/devinfo/"
+    mv "${srcdir}/install/quartus/common/devinfo/cyclone10lp" "${srcdir}/install/devinfo/"
+    mv "${srcdir}/install/quartus/common/devinfo/cyclonev" "${srcdir}/install/devinfo/"
+    mv "${srcdir}/install/quartus/common/devinfo/maxii" "${srcdir}/install/devinfo/"
+    mv "${srcdir}/install/quartus/common/devinfo/maxv" "${srcdir}/install/devinfo/"
+    mv "${srcdir}/install/quartus/common/devinfo/55nm" "${srcdir}/install/devinfo/"
+}
 
+package_intel_fpga_lite-license() {
     # Copy license file
-    install -D -m644 "${pkgdir}${_alteradir}/licenses/license.txt" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+    install -D -m644 "${srcdir}/install/licenses/license.txt" "${pkgdir}/usr/share/licenses/intel_fpga_lite/LICENSE"
+    mkdir -p "${pkgdir}${_inteldir}"
+    mv "${srcdir}/install/licenses" "${pkgdir}${_inteldir}"
+}
+
+package_intel_fpga_lite-ip() {
+    depends=("intel_fpga_lite-license=$pkgver-$pkgrel")
+    mkdir -p "${pkgdir}${_inteldir}"
+    mv "${srcdir}/install/ip" "${pkgdir}${_inteldir}"
+}
+
+package_intel_fpga_lite-modelsim_ase(){
+    depends=("intel_fpga_lite-license=$pkgver-$pkgrel")
+    install -D -m755 modelsim-ase.sh "${pkgdir}/etc/profile.d/modelsim-ase.sh"
+    install -D -m644 modelsim-ase.desktop "${pkgdir}/usr/share/applications/modelsim-ase.desktop"
+    mkdir -p "${pkgdir}${_inteldir}"
+    mv "${srcdir}/install/modelsim_ase" "${pkgdir}${_inteldir}"
+}
+
+package_intel_fpga_lite-nios2eds(){
+    depends=("intel_fpga_lite-license=$pkgver-$pkgrel")
+    mkdir -p "${pkgdir}${_inteldir}"
+    mv "${srcdir}/install/nios2eds" "${pkgdir}${_inteldir}"
+}
+
+package_intel_fpga_lite-quartus(){
+    depends=("intel_fpga_lite-license=$pkgver-$pkgrel" "intel_fpga_lite-ip=$pkgver-$pkgrel")
 
-    # Install integration files
     install -D -m755 quartus.sh "${pkgdir}/etc/profile.d/quartus.sh"
-    install -D -m644 51-usbblaster.rules "${pkgdir}/etc/udev/rules.d/51-usbblaster.rules"
     install -D -m644 quartus.desktop "${pkgdir}/usr/share/applications/quartus.desktop"
-    install -D -m644 modelsim-ase.desktop "${pkgdir}/usr/share/applications/modelsim-ase.desktop"
+    # Install usb blaster udev rule
+    install -D -m644 51-usbblaster.rules "${pkgdir}/etc/udev/rules.d/51-usbblaster.rules"
+
+    mkdir -p "${pkgdir}${_inteldir}"
+    mv "${srcdir}/install/quartus" "${pkgdir}${_inteldir}"
+}
+
+package_intel_fpga_lite-quartus-help(){
+    depends=("intel_fpga_lite-quartus=$pkgver-$pkgrel")
+    mkdir -p "${pkgdir}${_inteldir}/quartus/common/help/"
+    mv "${srcdir}/install/help/tutorial" "${pkgdir}${_inteldir}/quartus/common/help/"
+    mv "${srcdir}/install/help/webhelp" "${pkgdir}${_inteldir}/quartus/common/help/"
+}
+
+package_intel_fpga_lite-quartus-arria_lite(){
+    depends=("intel_fpga_lite-quartus=$pkgver-$pkgrel")
+    mkdir -p "${pkgdir}${_inteldir}/quartus/common/devinfo/"
+    mv "${srcdir}/install/devinfo/arriaii" "${pkgdir}${_inteldir}/quartus/common/devinfo/"
+}
+
+package_intel_fpga_lite-quartus-cyclone(){
+    depends=("intel_fpga_lite-quartus=$pkgver-$pkgrel")
+    mkdir -p "${pkgdir}${_inteldir}/quartus/common/devinfo/"
+    mv "${srcdir}/install/devinfo/cycloneive" "${pkgdir}${_inteldir}/quartus/common/devinfo/"
+    mv "${srcdir}/install/devinfo/cycloneivgx" "${pkgdir}${_inteldir}/quartus/common/devinfo/"
+}
+
+package_intel_fpga_lite-quartus-cyclone10lp(){
+    depends=("intel_fpga_lite-quartus=$pkgver-$pkgrel")
+    mkdir -p "${pkgdir}${_inteldir}/quartus/common/devinfo/"
+    mv "${srcdir}/install/devinfo/cyclone10lp" "${pkgdir}${_inteldir}/quartus/common/devinfo/"
+}
+
+package_intel_fpga_lite-quartus-cyclonev(){
+    depends=("intel_fpga_lite-quartus=$pkgver-$pkgrel")
+    mkdir -p "${pkgdir}${_inteldir}/quartus/common/devinfo/"
+    mv "${srcdir}/install/devinfo/cyclonev" "${pkgdir}${_inteldir}/quartus/common/devinfo/"
+}
+
+package_intel_fpga_lite-quartus-max(){
+    depends=("intel_fpga_lite-quartus=$pkgver-$pkgrel")
+    mkdir -p "${pkgdir}${_inteldir}/quartus/common/devinfo/"
+    mv "${srcdir}/install/devinfo/maxii" "${pkgdir}${_inteldir}/quartus/common/devinfo/"
+    mv "${srcdir}/install/devinfo/maxv" "${pkgdir}${_inteldir}/quartus/common/devinfo/"
+}
+
+package_intel_fpga_lite-quartus-max10(){
+    depends=("intel_fpga_lite-quartus=$pkgver-$pkgrel")
+    mkdir -p "${pkgdir}${_inteldir}/quartus/common/devinfo/"
+    mv "${srcdir}/install/devinfo/55nm" "${pkgdir}${_inteldir}/quartus/common/devinfo/"
 }
diff --git a/modelsim-ase.sh b/modelsim-ase.sh
new file mode 100644
index 000000000000..02edbc211c1e
--- /dev/null
+++ b/modelsim-ase.sh
@@ -0,0 +1 @@
+export PATH=$PATH:_inteldir/modelsim_ase/bin
diff --git a/quartus.sh b/quartus.sh
index cf627ae751f1..df851751f6d1 100644
--- a/quartus.sh
+++ b/quartus.sh
@@ -1,4 +1,5 @@
-export PATH=$PATH:_alteradir/quartus/bin:_alteradir/modelsim_ase/bin
+export PATH=$PATH:_inteldir/quartus/bin:_inteldir/quartus/sopc_builder/bin
+export QUARTUS_ROOTDIR=/opt/altera/18.1/quartus/
 
 # Detect if a 64bit machine and activate quartus
 # depending on it.