Make sandbox parameters consistent with pisi-1.1
It had seen to be borked in 2008 hence enableSandbox in pisi.conf is False by default.
This commit is contained in:
+2
-2
@@ -72,8 +72,8 @@ to be downloaded from a repository containing sources.
|
|||||||
help=_("PiSi binary package formats: '1.0', '1.1' (default)"))
|
help=_("PiSi binary package formats: '1.0', '1.1' (default)"))
|
||||||
group.add_option("--use-quilt", action="store_true", default=False,
|
group.add_option("--use-quilt", action="store_true", default=False,
|
||||||
help=_("Use quilt patch management system instead of GNU patch"))
|
help=_("Use quilt patch management system instead of GNU patch"))
|
||||||
group.add_option("--enable-sandbox", action="store_true", default=False,
|
group.add_option("--ignore-sandbox", action="store_true", default=False,
|
||||||
help=_("Constrain build process inside the build folder"))
|
help=_("Do not constrain build process inside the build folder"))
|
||||||
|
|
||||||
def add_steps_options(self):
|
def add_steps_options(self):
|
||||||
group = optparse.OptionGroup(self.parser, _("build steps"))
|
group = optparse.OptionGroup(self.parser, _("build steps"))
|
||||||
|
|||||||
@@ -24,6 +24,7 @@
|
|||||||
#[build]
|
#[build]
|
||||||
#host = i686-pc-linux-gnu
|
#host = i686-pc-linux-gnu
|
||||||
#generateDebug = False
|
#generateDebug = False
|
||||||
|
#enableSandbox = False
|
||||||
#jobs = "-j1"
|
#jobs = "-j1"
|
||||||
#CFLAGS= -mtune=generic -march=i686 -O2 -pipe -fomit-frame-pointer -fstack-protector -D_FORTIFY_SOURCE=2
|
#CFLAGS= -mtune=generic -march=i686 -O2 -pipe -fomit-frame-pointer -fstack-protector -D_FORTIFY_SOURCE=2
|
||||||
#CXXFLAGS= -mtune=generic -march=i686 -O2 -pipe -fomit-frame-pointer -fstack-protector -D_FORTIFY_SOURCE=2
|
#CXXFLAGS= -mtune=generic -march=i686 -O2 -pipe -fomit-frame-pointer -fstack-protector -D_FORTIFY_SOURCE=2
|
||||||
@@ -78,6 +79,7 @@ class BuildDefaults:
|
|||||||
host = "i686-pc-linux-gnu"
|
host = "i686-pc-linux-gnu"
|
||||||
jobs = "-j1"
|
jobs = "-j1"
|
||||||
generateDebug = False
|
generateDebug = False
|
||||||
|
enableSandbox = False
|
||||||
cflags = "-mtune=generic -march=i686 -O2 -pipe -fomit-frame-pointer -fstack-protector -D_FORTIFY_SOURCE=2"
|
cflags = "-mtune=generic -march=i686 -O2 -pipe -fomit-frame-pointer -fstack-protector -D_FORTIFY_SOURCE=2"
|
||||||
cxxflags = "-mtune=generic -march=i686 -O2 -pipe -fomit-frame-pointer -fstack-protector -D_FORTIFY_SOURCE=2"
|
cxxflags = "-mtune=generic -march=i686 -O2 -pipe -fomit-frame-pointer -fstack-protector -D_FORTIFY_SOURCE=2"
|
||||||
ldflags = "-Wl,-O1 -Wl,-z,relro -Wl,--hash-style=gnu"
|
ldflags = "-Wl,-O1 -Wl,-z,relro -Wl,--hash-style=gnu"
|
||||||
|
|||||||
@@ -438,7 +438,7 @@ class Builder:
|
|||||||
os.chdir(self.srcDir)
|
os.chdir(self.srcDir)
|
||||||
|
|
||||||
if func in self.actionLocals:
|
if func in self.actionLocals:
|
||||||
if not ctx.get_option('enable_sandbox'):
|
if ctx.get_option('ignore_sandbox') or not ctx.config.values.build.enablesandbox:
|
||||||
self.actionLocals[func]()
|
self.actionLocals[func]()
|
||||||
else:
|
else:
|
||||||
import catbox
|
import catbox
|
||||||
|
|||||||
Reference in New Issue
Block a user