From 08e151d24eefba8a2fb81da176bfa71c32f19649 Mon Sep 17 00:00:00 2001 From: Ronan Le Martret Date: Tue, 16 Apr 2013 18:08:25 +0200 Subject: [PATCH] - clean acl. --- Tizen_TZ_package/spec2yocto.py | 10 +--------- meta-tizen-ivi/recipes-tizen/acl/acl-extraconf.inc | 5 ++++- meta-tizen-ivi/recipes-tizen/acl/acl/acl.spec.patch | 13 +++++++++++++ 3 files changed, 18 insertions(+), 10 deletions(-) create mode 100644 meta-tizen-ivi/recipes-tizen/acl/acl/acl.spec.patch diff --git a/Tizen_TZ_package/spec2yocto.py b/Tizen_TZ_package/spec2yocto.py index 126878e..6987bd8 100755 --- a/Tizen_TZ_package/spec2yocto.py +++ b/Tizen_TZ_package/spec2yocto.py @@ -424,15 +424,7 @@ class specParser: tmp_package_spec_path=tmpSpecFile.name - if pkgName in ["acl"]: - currentSpecString=currentSpecString.replace('ln -sf ../../%{_lib}/libacl.so %{buildroot}/%{_libdir}/libacl.so','ln -sf ../../%{_lib}/libacl.so %{buildroot}/%{_libexecdir}/libacl.so') - - with tempfile.NamedTemporaryFile(mode='w', - suffix='tmp', - prefix=os.path.basename(tmp_package_spec_path), - delete=False) as tmpSpecFile: - tmpSpecFile.write(currentSpecString) - tmp_package_spec_path=tmpSpecFile.name + if pkgName in ["attr","acl"] : command += " --define='_libdir \${base_prefix}/lib'" diff --git a/meta-tizen-ivi/recipes-tizen/acl/acl-extraconf.inc b/meta-tizen-ivi/recipes-tizen/acl/acl-extraconf.inc index 755ab20..f1b3d97 100644 --- a/meta-tizen-ivi/recipes-tizen/acl/acl-extraconf.inc +++ b/meta-tizen-ivi/recipes-tizen/acl/acl-extraconf.inc @@ -10,11 +10,14 @@ EXTRA_OEMAKE = "PKG_LIB_DIR=${base_libdir} PKG_DEVLIB_DIR=${libdir}" SRC_URI += "file://relative-libdir.patch;striplevel=0 " -SRC_URI += "file://package_utilies.m4" +SRC_URI += "file://package_utilies.m4 \ + file://acl.spec.patch" do_patch () { echo RLM begining of do_patch cat ${WORKDIR}/relative-libdir.patch | patch -p0 -b + cat ${WORKDIR}/acl.spec.patch | patch -s -p1 --fuzz=2 + cp ${WORKDIR}/package_utilies.m4 m4/ echo RLM end of do_patch } diff --git a/meta-tizen-ivi/recipes-tizen/acl/acl/acl.spec.patch b/meta-tizen-ivi/recipes-tizen/acl/acl/acl.spec.patch new file mode 100644 index 0000000..d765e52 --- /dev/null +++ b/meta-tizen-ivi/recipes-tizen/acl/acl/acl.spec.patch @@ -0,0 +1,13 @@ +diff --git a/packaging/acl.spec b/packaging/acl.spec +index 5eceb09..65d98c1 100644 +--- a/packaging/acl.spec ++++ b/packaging/acl.spec +@@ -75,7 +75,7 @@ rm -rf %{buildroot}%{_defaultdocdir} + + # fix links to shared libs and permissions + rm -f %{buildroot}/%{_libdir}/libacl.so +-ln -sf ../../%{_lib}/libacl.so %{buildroot}/%{_libdir}/libacl.so ++ln -sf ../../%{_lib}/libacl.so.1 %{buildroot}/%{_libexecdir}/libacl.so + chmod 0755 %{buildroot}/%{_lib}/libacl.so.*.*.* + + %post -n libacl -p /sbin/ldconfig -- 2.7.4