From 2673776ea67287c4eadcce86b48bdbff6f349e30 Mon Sep 17 00:00:00 2001 From: Suleyman Poyraz Date: Fri, 12 Apr 2019 03:21:09 +0300 Subject: [PATCH] =?UTF-8?q?meson=20ve=20kernel=20build=20fonksiyon=20hatal?= =?UTF-8?q?ar=C4=B1=20giderildi?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/rst/conf.py | 0 inary-cli | 0 inary/.gitignore | 0 inary/actionsapi/README-inarytools.flags.txt | 0 inary/actionsapi/TODO | 0 inary/actionsapi/cmaketools.py | 15 ++++-- inary/actionsapi/mesontools.py | 6 ++- inary/actionsapi/patch | 48 ++++++++++++++++++++ inary/cli/README | 0 setup.py | 0 10 files changed, 63 insertions(+), 6 deletions(-) mode change 100755 => 100644 doc/rst/conf.py mode change 100755 => 100644 inary-cli mode change 100755 => 100644 inary/.gitignore mode change 100755 => 100644 inary/actionsapi/README-inarytools.flags.txt mode change 100755 => 100644 inary/actionsapi/TODO create mode 100644 inary/actionsapi/patch mode change 100755 => 100644 inary/cli/README mode change 100755 => 100644 setup.py diff --git a/doc/rst/conf.py b/doc/rst/conf.py old mode 100755 new mode 100644 diff --git a/inary-cli b/inary-cli old mode 100755 new mode 100644 diff --git a/inary/.gitignore b/inary/.gitignore old mode 100755 new mode 100644 diff --git a/inary/actionsapi/README-inarytools.flags.txt b/inary/actionsapi/README-inarytools.flags.txt old mode 100755 new mode 100644 diff --git a/inary/actionsapi/TODO b/inary/actionsapi/TODO old mode 100755 new mode 100644 diff --git a/inary/actionsapi/cmaketools.py b/inary/actionsapi/cmaketools.py index 3088ac77..ce2f1535 100644 --- a/inary/actionsapi/cmaketools.py +++ b/inary/actionsapi/cmaketools.py @@ -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.')) diff --git a/inary/actionsapi/mesontools.py b/inary/actionsapi/mesontools.py index b54db194..d6eb9929 100644 --- a/inary/actionsapi/mesontools.py +++ b/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 = 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 a/inary/actionsapi/patch b/inary/actionsapi/patch new file mode 100644 index 00000000..3e75b265 --- /dev/null +++ b/inary/actionsapi/patch @@ -0,0 +1,48 @@ +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(): diff --git a/inary/cli/README b/inary/cli/README old mode 100755 new mode 100644 diff --git a/setup.py b/setup.py old mode 100755 new mode 100644 -- 2.18.1