Changeset 1156 in ProjectBuilder for devel/pb-modules/etc/pb.conf

Timestamp:

Jan 13, 2011, 1:18:37 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Adds a global variable REVISION for version management
• Do not return in pb_send2target if pb file not available in order to shutdown VM in all cases
• Code and test sbx2setupvm
• setup_v now needs a fake pb_version_init fct added at the end of the script
• Fix pbdistrocheck install comand printing
• Fix mandralinux old distro build in pb.conf (Note only non symlink release files are important)

File:

• devel/pb-modules/etc/pb.conf (modified) (4 diffs)

devel/pb-modules/etc/pb.conf

@@ -33 +33 @@
 osrelfile mandriva = /etc/mandriva-release
 
-# Mandrake = 10.1,10.2
-osrelfile mandrake = /etc/mandrakelinux-release
+# Mageia TBC
+osrelfile mageia = /etc/mageia-release
 
 # Fedora >= 4
@@ -83 +83 @@
 # Here are the ambiguous file association
 # E.g. the file /etc/redhat-release is found on multiple distro such as redhat, rhel, centos, mandrake, vmware
-#
-
-# Mandrake <= 10.1
-osrelambfile mandrake = /etc/mandrake-release
+# These files should no be links
+#
+
+# Mandrake >= 10.1
+osrelambfile mandrake = /etc/mandrakelinux-release
 
 # Debian >= 3.1
@@ -117 +118 @@
 osrelexpr slackware = S[^ ]* (.+)$
 osrelexpr mandriva = Mandr[^ ]* [^ ]* release (.+) \(
-osrelexpr mandrake = Mandrakelinux release (.+) \(
+osrelexpr mandrake = Mandr[^ ]* release (.+) \(
 osrelexpr fedora = Fedora .*release (\d+) \(
 osrelexpr vmware = VMware ESX Server (\d+) \(
@@ -394 +395 @@
 osperldep mandrake-10.1 = Date-Manip
 ospkgdep mandrake-10.1 = rpm-build,wget,patch,make,ntp-client,perl-File-MimeInfo,diffutils
+ospkgdep mandrake-10.2 = rpm-build,wget,patch,make,ntp-client,perl-File-MimeInfo,diffutils,perl-DateManip
 osperldep md = 
 ospkgdep md = rpm-build,wget,patch,make,ntp-client,perl-File-MimeInfo,perl-File-BaseDir,perl-Date-Manip,diffutils