[Lsb-messages] /var/www/bzr/lsb/devel/puppet-lsb r532: add two more devel pkgs for devchk
Mats Wichmann
mats at linuxfoundation.org
Thu Feb 20 17:12:34 UTC 2014
------------------------------------------------------------
revno: 532
committer: Mats Wichmann <mats at linuxfoundation.org>
branch nick: puppet-lsb
timestamp: Thu 2014-02-20 10:12:34 -0700
message:
add two more devel pkgs for devchk
modified:
modules/apachehttpd/files/update-betaspecs
modules/buildbot/manifests/slavepkgs.pp
-------------- next part --------------
=== modified file 'modules/apachehttpd/files/update-betaspecs'
--- a/modules/apachehttpd/files/update-betaspecs 2012-11-09 15:45:36 +0000
+++ b/modules/apachehttpd/files/update-betaspecs 2014-02-20 17:12:34 +0000
@@ -21,7 +21,7 @@
# the current tags to export from for "beta" versions:
BETAFHS="-1"
-BETALSB=LSB-4.1
+BETALSB=LSB-5.0-beta
# obtain the current FHS spec from bzr
[ -d /tmp/fhs-spec ] && rm -rf /tmp/fhs-spec
@@ -46,7 +46,7 @@
<title>FHS Snapshot Specification</title>
</head>
<body>
-<h1>Filesystem Hierarchy Specification - Beta</h1>
+<h1>Filesystem Hierarchy Specification - Snapshot</h1>
<ul>
<li><a href="fhs.txt">UTF-8 Text</a></li>
<li><a href="fhs.html">HTML (one page)</a></li>
@@ -89,9 +89,29 @@
# LSB specs are already built. Grab them from booksets and books branches,
# but only the directories that begin with LSB- are "published"
-# for LSB 5, no more looking in books - change this just for snapshots for now
+# with the LSB 5.0 reorganization, there are no more published specs
+# in the "books" tree, but keep the existing structure for a while
+# just in case this mechanism needs to be used to publish an older spec.
+# later we can clean it up.
+
+# snapshots: just take the top
+#for branch in $BRANCHURL/booksets $BRANCHURL/books
+for branch in $BRANCHURL/booksets
+do
+ for path in $(bzr ls $branch)
+ do
+ book=$(echo $path | sed "s,$branch/,,")
+ if [ $(echo $book | grep "^LSB-" | wc -l) -ne 0 ]
+ then
+ [ -d $SNAPSHOTS_PATH/lsb/$book ] && rm -rf $SNAPSHOTS_PATH/lsb/$book
+ mkdir -p $SNAPSHOTS_PATH/lsb/$book
+ bzr export $SNAPSHOTS_PATH/lsb/$book $path
+ fi
+ done
+done
# beta specs: export a specific tagged revision (tag set at top of this script)
+#for branch in $BRANCHURL/booksets $BRANCHURL/books
for branch in $BRANCHURL/booksets $BRANCHURL/books
do
for path in $(bzr ls $branch)
@@ -102,22 +122,8 @@
[ -d $BETASPECS_PATH/lsb/$book ] && rm -rf $BETASPECS_PATH/lsb/$book
mkdir -p $BETASPECS_PATH/lsb/$book
bzr export -r $BETALSB $BETASPECS_PATH/lsb/$book $path
- fi
- done
-done
-
-# snapshots: just take the top
-#for branch in $BRANCHURL/booksets $BRANCHURL/books
-for branch in $BRANCHURL/booksets
-do
- for path in $(bzr ls $branch)
- do
- book=$(echo $path | sed "s,$branch/,,")
- if [ $(echo $book | grep "^LSB-" | wc -l) -ne 0 ]
- then
- [ -d $SNAPSHOTS_PATH/lsb/$book ] && rm -rf $SNAPSHOTS_PATH/lsb/$book
- mkdir -p $SNAPSHOTS_PATH/lsb/$book
- bzr export $SNAPSHOTS_PATH/lsb/$book $path
+ # XXX check for error, and give up - if the tag does not work
+ # XXX once, there is no point in continuing
fi
done
done
=== modified file 'modules/buildbot/manifests/slavepkgs.pp'
--- a/modules/buildbot/manifests/slavepkgs.pp 2013-07-15 15:53:05 +0000
+++ b/modules/buildbot/manifests/slavepkgs.pp 2014-02-20 17:12:34 +0000
@@ -229,6 +229,10 @@
/^SLES/ => 'cairo-devel',
default => 'cairo-devel',
}
+ $cairogobjectpkg = $operatingsystem ? {
+ /^SLES/ => 'cairo-gobject-devel',
+ default => 'cairo-devel',
+ }
$cupspkg = $operatingsystem ? {
/^SLES/ => 'cups-devel',
default => 'cups-devel',
@@ -243,10 +247,14 @@
/^Fedora/ => 'freetype-devel',
default => 'freetype2-devel',
}
- $gtkpkg = $operatingsystem ? {
+ $gtk2pkg = $operatingsystem ? {
/^SLES/ => 'gtk2-devel',
default => 'gtk2-devel',
}
+ $gtk3pkg = $operatingsystem ? {
+ /^SLES/ => 'gtk3-devel',
+ default => 'gtk3-devel',
+ }
$jpegpkg = $operatingsystem ? {
/^SLES/ => 'libjpeg-devel',
/^Fedora/ => 'libjpeg-turbo-devel',
@@ -311,11 +319,11 @@
}
$devchklist = [ "$qt4pkg", "$alsapkg", "$atkpkg", "$cairopkg",
"$cupspkg", "$fontconfigpkg", "$freetypepkg",
- "$gtkpkg", "$jpegpkg", "$GLpkg",
+ "$gtk2pkg", "$gtk3pkg", "$jpegpkg", "$GLpkg",
'libxml2-devel', "$nsprpkg", "$nsspkg", "$pangopkg",
"$pngdevpkg", "$zlibpkg", "$xprotopkg", "$xrenderpkg",
"$kernelpkg", "$sanepkg", "$xkbpkg", 'libxslt-devel',
- "$tiffpkg" ]
+ "$tiffpkg", $cairogobjectpkg ]
# end devchk
# command for forcing the small-word environment
More information about the lsb-messages
mailing list