Adding new os='generic' profiling (resolves product name to SUSE Linux)

SUSE · Apr 17, 2023 · 05ecff5 · 05ecff5
1 parent 43bf24a
commit 05ecff5
Show file tree

Hide file tree

Showing 42 changed files with 42 additions and 11 deletions.
diff --git a/DC-alp-bedrock b/DC-alp-bedrock
@@ -3,8 +3,6 @@
 
 MAIN="ALP.asm.xml"
 SRC_DIR="articles"
-ASSEMBLY="yes"
-# ASSEMBLY_DIR="xml"
 
 STYLEROOT="/usr/share/xml/docbook/stylesheet/suse2022-ns"
 DOCBOOK5_RNG_URI="urn:x-suse:rng:v2:geekodoc-flat"

diff --git a/DC-alp-micro b/DC-alp-micro
@@ -3,8 +3,6 @@
 
 MAIN="ALP.asm.xml"
 SRC_DIR="articles"
-ASSEMBLY="yes"
-# ASSEMBLY_DIR="xml"
 
 STYLEROOT="/usr/share/xml/docbook/stylesheet/suse2022-ns"
 DOCBOOK5_RNG_URI="urn:x-suse:rng:v2:geekodoc-flat"

diff --git a/DC-bci-variants b/DC-bci-variants
@@ -3,9 +3,9 @@
 
 MAIN="BCI.asm.xml"
 SRC_DIR="articles"
-ASSEMBLY="yes"
 # ROOTID="bci-variants"
 
+PROFOS="generic"
 #PROFCONDITION="suse-product"
 #PROFCONDITION="suse-product;beta"
 #PROFCONDITION="community-project"

diff --git a/DC-concept-bci b/DC-concept-bci
@@ -5,6 +5,7 @@ MAIN="concept-bci.xml"
 ROOTID="concept-bci"
 
 PROFCONDITION="suse-product"
+PROFOS="generic"
 #PROFCONDITION="suse-product;beta"
 #PROFCONDITION="community-project"
 

diff --git a/DC-concept-bci-get-started b/DC-concept-bci-get-started
@@ -5,6 +5,7 @@ MAIN="concept-bci-get-started.xml"
 ROOTID="concept-bci-get-started"
 
 PROFCONDITION="suse-product"
+PROFOS="generic"
 #PROFCONDITION="suse-product;beta"
 #PROFCONDITION="community-project"
 

diff --git a/DC-concept-klp b/DC-concept-klp
@@ -5,6 +5,7 @@ MAIN="concept-klp.xml"
 ROOTID="concept-klp"
 
 PROFCONDITION="suse-product"
+PROFOS="generic"
 #PROFCONDITION="suse-product;beta"
 #PROFCONDITION="community-project"
 

diff --git a/DC-concept-manage-virtual-machines-libvirt b/DC-concept-manage-virtual-machines-libvirt
@@ -5,6 +5,7 @@ MAIN="concept-manage-virtual-machines-libvirt.xml"
 ROOTID="concept-manage-virtual-machines-libvirt"
 
 PROFCONDITION="suse-product"
+PROFOS="generic"
 #PROFCONDITION="suse-product;beta"
 #PROFCONDITION="community-project"
 

diff --git a/DC-concept-minimal-vm b/DC-concept-minimal-vm
@@ -5,6 +5,7 @@ MAIN="concept-minimal-vm.xml"
 ROOTID="concept-minimal-vm"
 
 PROFCONDITION="suse-product"
+PROFOS="generic"
 #PROFCONDITION="suse-product;beta"
 #PROFCONDITION="community-project"
 

diff --git a/DC-concept-securing-with-systemd b/DC-concept-securing-with-systemd
@@ -5,6 +5,7 @@ MAIN="concept-securing-with-systemd.xml"
 ROOTID="concept-securing-with-systemd"
 
 PROFCONDITION="suse-product"
+PROFOS="generic"
 #PROFCONDITION="suse-product;beta"
 #PROFCONDITION="community-project"
 

diff --git a/DC-concept-sudo b/DC-concept-sudo
@@ -5,6 +5,7 @@ MAIN="concept-sudo.xml"
 ROOTID="concept-sudo"
 
 PROFCONDITION="suse-product"
+PROFOS="generic"
 #PROFCONDITION="suse-product;beta"
 #PROFCONDITION="community-project"
 

diff --git a/DC-concept-systemd b/DC-concept-systemd
@@ -5,6 +5,7 @@ MAIN="concept-systemd.xml"
 ROOTID="concept-systemd"
 
 PROFCONDITION="suse-product"
+PROFOS="generic"
 #PROFCONDITION="suse-product;beta"
 #PROFCONDITION="community-project"
 

diff --git a/DC-concept-time-synchronization-ntp b/DC-concept-time-synchronization-ntp
@@ -5,6 +5,7 @@ MAIN="concept-time-synchronization-ntp.xml"
 ROOTID="concept-time-synchronization-ntp"
 
 PROFCONDITION="suse-product"
+PROFOS="generic"
 #PROFCONDITION="suse-product;beta"
 #PROFCONDITION="community-project"
 

diff --git a/DC-concept-virtual-disk-cache-modes b/DC-concept-virtual-disk-cache-modes
@@ -5,6 +5,7 @@ MAIN="concept-virtual-disk-cache-modes.xml"
 ROOTID="concept-virtual-disk-cache-modes"
 
 PROFCONDITION="suse-product"
+PROFOS="generic"
 #PROFCONDITION="suse-product;beta"
 #PROFCONDITION="community-project"
 

diff --git a/DC-concept-virtualization b/DC-concept-virtualization
@@ -5,6 +5,7 @@ MAIN="concept-virtualization.xml"
 ROOTID="concept-virtualization"
 
 PROFCONDITION="suse-product"
+PROFOS="generic"
 #PROFCONDITION="suse-product;beta"
 #PROFCONDITION="community-project"
 

diff --git a/DC-concept-zypper b/DC-concept-zypper
@@ -5,6 +5,7 @@ MAIN="concept-zypper.xml"
 ROOTID="concept-zypper"
 
 PROFCONDITION="suse-product"
+PROFOS="generic"
 #PROFCONDITION="suse-product;beta"
 #PROFCONDITION="community-project"
 

diff --git a/DC-reference-connection-accounting-utilities b/DC-reference-connection-accounting-utilities
@@ -5,6 +5,7 @@ MAIN="reference-connection-accounting-utilities.xml"
 ROOTID="reference-connection-accounting-utilities"
 
 PROFCONDITION="suse-product"
+PROFOS="generic"
 #PROFCONDITION="suse-product;beta"
 #PROFCONDITION="community-project"
 

diff --git a/DC-reference-managing-systemd-targets-systemctl b/DC-reference-managing-systemd-targets-systemctl
@@ -5,6 +5,7 @@ MAIN="reference-systemctl-managing-targets.xml"
 ROOTID="reference-systemctl-managing-targets"
 
 PROFCONDITION="suse-product"
+PROFOS="generic"
 #PROFCONDITION="suse-product;beta"
 #PROFCONDITION="community-project"
 

diff --git a/DC-reference-network-bonding-teaming-comparison b/DC-reference-network-bonding-teaming-comparison
@@ -2,6 +2,7 @@ MAIN="reference-network-bonding-teaming-comparison.xml"
 ROOTID="reference-network-bonding-teaming-comparison"
 
 PROFCONDITION="suse-product"
+PROFOS="generic"
 #PROFCONDITION="suse-product;beta"
 #PROFCONDITION="community-project"
 

diff --git a/DC-reference-systemctl-enable-disable-services b/DC-reference-systemctl-enable-disable-services
@@ -5,6 +5,7 @@ MAIN="reference-systemctl-enable-disable-services.xml"
 ROOTID="reference-systemctl-enable-disable-services"
 
 PROFCONDITION="suse-product"
+PROFOS="generic"
 #PROFCONDITION="suse-product;beta"
 #PROFCONDITION="community-project"
 

diff --git a/DC-reference-systemctl-start-stop-services b/DC-reference-systemctl-start-stop-services
@@ -5,6 +5,7 @@ MAIN="reference-systemctl-start-stop-services.xml"
 ROOTID="reference-systemctl-start-stop-services"
 
 PROFCONDITION="suse-product"
+PROFOS="generic"
 #PROFCONDITION="suse-product;beta"
 #PROFCONDITION="community-project"
 

diff --git a/DC-reference-zypper-install b/DC-reference-zypper-install
@@ -5,6 +5,7 @@ MAIN="reference-zypper-install.xml"
 ROOTID="reference-zypper-install"
 
 PROFCONDITION="suse-product"
+PROFOS="generic"
 #PROFCONDITION="suse-product;beta"
 #PROFCONDITION="community-project"
 

diff --git a/DC-systemd-working-with-timers b/DC-systemd-working-with-timers
@@ -7,7 +7,7 @@ MAIN="systemd-timer-working-with.asm.xml"
 SRC_DIR="articles"
 
 ## Profiling
-#PROFOS="sles"
+PROFOS="generic"
 #PROFARCH="x86_64;zseries;power;aarch64"
 
 ## stylesheet location

diff --git a/DC-task-add-modules-extensions-after-installation b/DC-task-add-modules-extensions-after-installation
@@ -5,6 +5,7 @@ MAIN="task-add-modules-extensions-after-installation.xml"
 ROOTID="task-add-modules-extensions-after-installation"
 
 PROFCONDITION="suse-product"
+PROFOS="generic"
 #PROFCONDITION="suse-product;beta"
 #PROFCONDITION="community-project"
 

diff --git a/DC-task-assign-pci-device-libvirt b/DC-task-assign-pci-device-libvirt
@@ -5,6 +5,7 @@ MAIN="task-assign-pci-device-libvirt.xml"
 ROOTID="task-assign-pci-device-libvirt"
 
 PROFCONDITION="suse-product"
+PROFOS="generic"
 #PROFCONDITION="suse-product;beta"
 #PROFCONDITION="community-project"
 

diff --git a/DC-task-check-cpu-temperature b/DC-task-check-cpu-temperature
@@ -4,7 +4,7 @@
 MAIN="task-check-cpu-temperature.xml"
 # ROOTID=""
 
-PROFCONDITION="sle"
+PROFCONDITION="generic"
 #PROFCONDITION="suse-product;beta"
 #PROFCONDITION="community-project"
 

diff --git a/DC-task-configure-network-bonding b/DC-task-configure-network-bonding
@@ -2,6 +2,7 @@ MAIN="task-configure-network-bonding.xml"
 ROOTID="task-configure-network-bonding"
 
 PROFCONDITION="suse-product"
+PROFOS="generic"
 #PROFCONDITION="suse-product;beta"
 #PROFCONDITION="community-project"
 

diff --git a/DC-task-configure-network-teaming b/DC-task-configure-network-teaming
@@ -2,6 +2,7 @@ MAIN="task-configure-network-teaming.xml"
 ROOTID="task-configure-network-teaming"
 
 PROFCONDITION="suse-product"
+PROFOS="generic"
 #PROFCONDITION="suse-product;beta"
 #PROFCONDITION="community-project"
 

diff --git a/DC-task-configure-ntp b/DC-task-configure-ntp
@@ -5,6 +5,7 @@ MAIN="task-configure-ntp.xml"
 ROOTID="task-configure-ntp"
 
 PROFCONDITION="suse-product"
+PROFOS="generic"
 #PROFCONDITION="suse-product;beta"
 #PROFCONDITION="community-project"
 

diff --git a/DC-task-configure-sudo b/DC-task-configure-sudo
@@ -5,6 +5,7 @@ MAIN="task-configure-sudo.xml"
 ROOTID="task-configure-sudo"
 
 PROFCONDITION="suse-product"
+PROFOS="generic"
 #PROFCONDITION="suse-product;beta"
 #PROFCONDITION="community-project"
 

diff --git a/DC-task-configure-virtual-machine-manager b/DC-task-configure-virtual-machine-manager
@@ -5,6 +5,7 @@ MAIN="task-configure-virtual-machine-manager.xml"
 ROOTID="task-configure-virtual-machine-manager"
 
 PROFCONDITION="suse-product"
+PROFOS="generic"
 #PROFCONDITION="suse-product;beta"
 #PROFCONDITION="community-project"
 

diff --git a/DC-task-create-systemd-timers b/DC-task-create-systemd-timers
@@ -5,6 +5,7 @@ MAIN="task-create-systemd-timers.xml"
 ROOTID="task-create-systemd-timers"
 
 PROFCONDITION="suse-product"
+PROFOS="generic"
 #PROFCONDITION="suse-product;beta"
 #PROFCONDITION="community-project"
 

diff --git a/DC-task-debug-failed-systemd-services b/DC-task-debug-failed-systemd-services
@@ -5,6 +5,7 @@ MAIN="task-debug-failed-systemd-services.xml"
 # ROOTID="task-example"
 
 PROFCONDITION="suse-product"
+PROFOS="generic"
 #PROFCONDITION="suse-product;beta"
 #PROFCONDITION="community-project"
 

diff --git a/DC-task-delete-modules-extensions b/DC-task-delete-modules-extensions
@@ -5,6 +5,7 @@ MAIN="task-delete-modules-extensions.xml"
 ROOTID="task-delete-modules-extensions"
 
 PROFCONDITION="suse-product"
+PROFOS="generic"
 #PROFCONDITION="suse-product;beta"
 #PROFCONDITION="community-project"
 

diff --git a/DC-task-forward-root-mail b/DC-task-forward-root-mail
@@ -5,6 +5,7 @@ MAIN="task-forward-root-mail.xml"
 ROOTID="task-forward-root-mail"
 
 PROFCONDITION="suse-product"
+PROFOS="generic"
 #PROFCONDITION="suse-product;beta"
 #PROFCONDITION="community-project"
 

diff --git a/DC-task-install-virtualization-components b/DC-task-install-virtualization-components
@@ -5,6 +5,7 @@ MAIN="task-install-virtualization-components.xml"
 ROOTID="task-install-virtualization-components"
 
 PROFCONDITION="suse-product"
+PROFOS="generic"
 #PROFCONDITION="suse-product;beta"
 #PROFCONDITION="community-project"
 

diff --git a/DC-task-modify-kernel-boot-parameter b/DC-task-modify-kernel-boot-parameter
@@ -4,6 +4,7 @@
 MAIN="task-modify-kernel-boot-parameters.xml"
 ROOTID=""
 
+PROFOS="generic"
 # PROFCONDITION="suse-product"
 # PROFCONDITION="suse-product;beta"
 # PROFCONDITION="community-project"

diff --git a/DC-task-register-deregister-product-after-installation b/DC-task-register-deregister-product-after-installation
@@ -5,9 +5,9 @@ MAIN="task-register-deregister-product-after-installation.xml"
 ROOTID="task-register-product-after-installation"
 
 PROFCONDITION="suse-product"
+PROFOS="generic"
 #PROFCONDITION="suse-product;beta"
 #PROFCONDITION="community-project"
-PROFOS="sles"
 
 DRAFT=1
 

diff --git a/DC-task-send-termination-signals-systemd b/DC-task-send-termination-signals-systemd
@@ -5,6 +5,7 @@ MAIN="task-send-termination-signals-systemd.xml"
 ROOTID="task-send-termination-signals-systemd"
 
 PROFCONDITION="suse-product"
+PROFOS="generic"
 #PROFCONDITION="suse-product;beta"
 #PROFCONDITION="community-project"
 

diff --git a/DC-task-set-up-uefi-http-boot-server b/DC-task-set-up-uefi-http-boot-server
@@ -5,6 +5,7 @@ MAIN="task-set-up-uefi-http-boot-server.xml"
 ROOTID="task-set-up-uefi-http-boot-server"
 
 PROFCONDITION="suse-product"
+PROFOS="generic"
 #PROFCONDITION="suse-product;beta"
 #PROFCONDITION="community-project"
 

diff --git a/DC-task-setup-free-radius-server b/DC-task-setup-free-radius-server
@@ -5,6 +5,7 @@ MAIN="task-setup-free-radius-server.xml"
 ROOTID="task-setup-free-radius-server"
 
 PROFCONDITION="suse-product"
+PROFOS="generic"
 #PROFCONDITION="suse-product;beta"
 #PROFCONDITION="community-project"
 

diff --git a/DC-task-working-sudo b/DC-task-working-sudo
@@ -5,6 +5,7 @@ MAIN="task-working-sudo.xml"
 ROOTID="task-working-sudo"
 
 PROFCONDITION="suse-product"
+PROFOS="generic"
 #PROFCONDITION="suse-product;beta"
 #PROFCONDITION="community-project"
 

diff --git a/common/product-entities.ent b/common/product-entities.ent
@@ -2,12 +2,12 @@
 <!-- This file can be edited downstream. -->
 
 <!-- PRODUCT NAME AND VERSIONS -->
+<!-- Use "&generic;" for everything not ALP and SLE Micro -->
 <!ENTITY codename               "<phrase xmlns='http://docbook.org/ns/docbook'><phrase os='alp-micro'>Micro</phrase><phrase os='alp-bedrock'>Bedrock</phrase></phrase>">
-<!ENTITY productname            "<phrase xmlns='http://docbook.org/ns/docbook'><phrase os='alp-micro'>&suse; ALP &codename;</phrase><phrase os='alp-bedrock'>&suse; ALP &codename;</phrase><phrase os='slemicro'>&slem;</phrase><phrase os='sles'>&sles;</phrase></phrase>">
-<!ENTITY productnameshort       "<phrase xmlns='http://docbook.org/ns/docbook'><phrase os='alp-micro'>ALP &codename;</phrase><phrase os='alp-bedrock'>ALP &codename;</phrase><phrase os='slemicro'>&slema;</phrase></phrase>">
+<!ENTITY productname            "<phrase xmlns='http://docbook.org/ns/docbook'><phrase os='alp-micro'>&suse; ALP &codename;</phrase><phrase os='alp-bedrock'>&suse; ALP  &codename;</phrase><phrase os='slemicro'>&slem;</phrase><phrase os='generic'>&suselinux;</phrase></phrase>">
+<!ENTITY productnameshort       "<phrase xmlns='http://docbook.org/ns/docbook'><phrase os='alp-micro'>ALP &codename;</phrase><phrase os='alp-bedrock'>ALP &codename;</phrase><phrase os='slemicro'>&slema;</phrase><phrase os='generic'>&suselinux;</phrase></phrase>">
 <!ENTITY productnumber          "<phrase xmlns='http://docbook.org/ns/docbook'><phrase os='alp-micro;alp-bedrock'>0.1</phrase><phrase os='slemicro'>5.4</phrase></phrase>">
 
-
 <!-- PROJECT REPOSITORY URL -->
 <!ENTITY repo-url               "https://github.com/SUSE/doc-modular">
 <!ENTITY repo-readme            "&repo-url;/blob/main/README.adoc">