Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Esteban Blanc
slapos
Commits
4661bd65
Commit
4661bd65
authored
Apr 28, 2020
by
Dmitry Blinov
Committed by
Esteban Blanc
Nov 23, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
pwr: randomize compile-time xorg lockfiles
parent
93f912e8
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
3 deletions
+12
-3
component/proviewR/buildout.cfg
component/proviewR/buildout.cfg
+12
-3
No files found.
component/proviewR/buildout.cfg
View file @
4661bd65
...
@@ -296,7 +296,7 @@ version = 63dcc19
...
@@ -296,7 +296,7 @@ version = 63dcc19
location = ${buildout:parts-directory}/${:_buildout_section_name_}
location = ${buildout:parts-directory}/${:_buildout_section_name_}
aroot=${:location}/local/adm
aroot=${:location}/local/adm
keep-compile-dir = true
keep-compile-dir = true
make-binary = bash -c '${:compile-dir}/build.sh'
make-binary = bash -c '
export XORG_LOCK_DIR=`cat ./xorg-dirname` &&
${:compile-dir}/build.sh'
incdir = -I${libdb:location}/include -I${qt4-qmake:location}/include -I${qt4-qmake:location}/include/QtGui -I${qt4-qmake:location}/include/Qt -I${alsa:location}/include -I${phonon-qt4:location}/include -I${fontconfig:location}/include
incdir = -I${libdb:location}/include -I${qt4-qmake:location}/include -I${qt4-qmake:location}/include/QtGui -I${qt4-qmake:location}/include/Qt -I${alsa:location}/include -I${phonon-qt4:location}/include -I${fontconfig:location}/include
libs = -L${libdb:location}/lib -ldb_cxx-5 -L${gettext:location}/lib -L${alsa:location}/lib -L${zlib:location}/lib -L ${qt4-qmake:location}/lib -L${phonon-qt4:location}/lib -L${fontconfig:location}/lib
libs = -L${libdb:location}/lib -ldb_cxx-5 -L${gettext:location}/lib -L${alsa:location}/lib -L${zlib:location}/lib -L ${qt4-qmake:location}/lib -L${phonon-qt4:location}/lib -L${fontconfig:location}/lib
compile-dir = ${:location}__compile__/proview-${:version}*
compile-dir = ${:location}__compile__/proview-${:version}*
...
@@ -377,11 +377,20 @@ pre-build =
...
@@ -377,11 +377,20 @@ pre-build =
echo "my command name is `ps -ly $$`"
echo "my command name is `ps -ly $$`"
if [ ! -z "$PID" ]; then kill -TERM $PID; fi
if [ ! -z "$PID" ]; then kill -TERM $PID; fi
echo 'I GOT THROUGH IF'
echo 'I GOT THROUGH IF'
${xserver:location}/bin/Xorg -noreset +extension GLX +extension RANDR +extension RENDER -config ${:compile-dir}/src/tools/dummy_display/xorg.conf :99 &
rand=`bash -c 'echo $RANDOM'`
echo "rand is $rand"
dirname="/tmp/xorg-socks-n-locks-$rand"
mkdir $dirname
echo made a xorg dir $dirname
echo $dirname > ./xorg-dirname
export XORG_LOCK_DIR=$dirname
${xserver:location}/bin/Xorg -noreset +extension RANDR +extension RENDER -config ${:compile-dir}/src/tools/dummy_display/xorg.conf :99 &
post-install =
post-install =
PID=`pgrep -u "$(whoami)" -f -x '${xserver:location}/bin/Xorg.*'` || true #pgrep returns 1 on notfound
PID=`pgrep -u "$(whoami)" -f -x '${xserver:location}/bin/Xorg.*'` || true #pgrep returns 1 on notfound
if [ ! -z "$PID" ]; then kill -TERM $PID; fi
if [ ! -z "$PID" ]; then kill -TERM $PID; fi
echo deleting xorg stuff
if [ -x ./xorg-dirname]; then dirname=`cat ./xorg-dirname` && rm -rf $dirname && rm ./xorg-dirname;fi
make-targets =
make-targets =
make-options =
make-options =
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment