Kaydet (Commit) 2673776e authored tarafından Suleyman Poyraz's avatar Suleyman Poyraz

meson ve kernel build fonksiyon hataları giderildi

üst c2f17cf0
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
......@@ -59,10 +59,17 @@ def configure(parameters = '', installPrefix = '/{}'.format(get.defaultprefixDIR
"""configure source with given cmake parameters = "-DCMAKE_BUILD_TYPE -DCMAKE_CXX_FLAGS ... " """
if can_access_file(join_path(sourceDir, 'CMakeLists.txt')):
args = 'cmake -DCMAKE_INSTALL_PREFIX={0} \
-DCMAKE_C_FLAGS="{1}" \
-DCMAKE_CXX_FLAGS="{2}" \
-DCMAKE_LD_FLAGS="{3}" \
-DCMAKE_BUILD_TYPE=RelWithDebInfo {4} {5}'.format(installPrefix, get.CFLAGS(), get.CXXFLAGS(), get.LDFLAGS(), parameters, sourceDir)
-DCMAKE_INSTALL_LIBDIR={1} \
-DCMAKE_C_FLAGS="{2}" \
-DCMAKE_CXX_FLAGS="{3}" \
-DCMAKE_LD_FLAGS="{4}" \
-DCMAKE_BUILD_TYPE=RelWithDebInfo {5} {6}'.format(installPrefix,
"/usr/lib32 " if get.buildTYPE() == "emul32" else "/usr/lib",
get.CFLAGS(),
get.CXXFLAGS(),
get.LDFLAGS(),
parameters,
sourceDir)
if system(args):
raise ConfigureError(_('Configure failed.'))
......
import inary.actionsapi
import inary.util as util
from inary.actionsapi.shelltools import system
from inary.actionsapi.shelltools import can_access_file
from inary.actionsapi import get
......@@ -11,7 +12,7 @@ class MesonError(inary.actionsapi.Error):
def meson_configure(parameters=""):
if can_access_file('meson.build'):
prefix = get.emul32prefixDIR() if get.buildTYPE() == "emul32" else get.defaultprefixDIR()
prefix = get.defaultprefixDIR()
args="meson \
--prefix=/{0} \
--buildtype=plain \
......@@ -37,7 +38,8 @@ def ninja_build(parameters=""):
raise MesonError(_("[Ninja]: Build failed."))
def ninja_install(parameters=""):
if system('DESTDIR="{}" ninja install {} -C inaryPackageBuild'.format(get.installDIR(),get.makeJOBS())):
insdir = util.join_path(get.installDIR(),"emul32") if get.buildTYPE() == "emul32" else get.installDIR()
if system('DESTDIR="{}" ninja install {} -C inaryPackageBuild'.format(insdir,get.makeJOBS())):
raise MesonError(_("[Ninja]: Installation failed."))
def ninja_check():
......
diff --git i/inary/actionsapi/README-inarytools.flags.txt w/inary/actionsapi/README-inarytools.flags.txt
old mode 100755
new mode 100644
diff --git i/inary/actionsapi/TODO w/inary/actionsapi/TODO
old mode 100755
new mode 100644
diff --git i/inary/actionsapi/kerneltools.py w/inary/actionsapi/kerneltools.py
index edcbbe43..ae934616 100644
--- i/inary/actionsapi/kerneltools.py
+++ w/inary/actionsapi/kerneltools.py
@@ -120,7 +120,7 @@ def getKernelVersion(flavour=None):
def configure():
# Copy the relevant configuration file
- shutil.copy("configs/kernel-{}-config".format(get.ARCH()), ".config")
+ # shutil.copy("files/configs/kernel-{}-config".format(get.ARCH()), ".config")
# Set EXTRAVERSION
inarytools.dosed("Makefile", "EXTRAVERSION =.*", "EXTRAVERSION = {}".format(__getExtraVersion()))
diff --git i/inary/actionsapi/mesontools.py w/inary/actionsapi/mesontools.py
index b54db194..35558a81 100644
--- i/inary/actionsapi/mesontools.py
+++ w/inary/actionsapi/mesontools.py
@@ -1,4 +1,5 @@
import inary.actionsapi
+import inary.util as util
from inary.actionsapi.shelltools import system
from inary.actionsapi.shelltools import can_access_file
from inary.actionsapi import get
@@ -11,7 +12,7 @@ class MesonError(inary.actionsapi.Error):
def meson_configure(parameters=""):
if can_access_file('meson.build'):
- prefix = get.emul32prefixDIR() if get.buildTYPE() == "emul32" else get.defaultprefixDIR()
+ prefix = get.defaultprefixDIR()
args="meson \
--prefix=/{0} \
--buildtype=plain \
@@ -37,7 +38,8 @@ def ninja_build(parameters=""):
raise MesonError(_("[Ninja]: Build failed."))
def ninja_install(parameters=""):
- if system('DESTDIR="{}" ninja install {} -C inaryPackageBuild'.format(get.installDIR(),get.makeJOBS())):
+ insdir= get.installDIR() if get.buildTYPE() == "emul32" else util.join_path(get.defaultprefixDIR(),"emul32")
+ if system('DESTDIR="{}" ninja install {} -C inaryPackageBuild'.format(insdir,get.makeJOBS())):
raise MesonError(_("[Ninja]: Installation failed."))
def ninja_check():
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment