From 0ed8472e560829692f1d757773e400599deb1b4c Mon Sep 17 00:00:00 2001 From: aydemir Date: Sun, 23 Aug 2015 20:50:33 +0300 Subject: [PATCH] pisilinux-dev-tools delete --- pisilinux-dev-tools/actions.py | 12 --- .../files/fix_detect_mesa.patch | 15 --- .../files/ignore_glibc-32bit.patch | 11 -- pisilinux-dev-tools/files/spped_up.patch | 57 ---------- pisilinux-dev-tools/pspec.xml | 100 ------------------ pisilinux-dev-tools/translations.xml | 8 -- 6 files changed, 203 deletions(-) delete mode 100644 pisilinux-dev-tools/actions.py delete mode 100644 pisilinux-dev-tools/files/fix_detect_mesa.patch delete mode 100644 pisilinux-dev-tools/files/ignore_glibc-32bit.patch delete mode 100644 pisilinux-dev-tools/files/spped_up.patch delete mode 100644 pisilinux-dev-tools/pspec.xml delete mode 100644 pisilinux-dev-tools/translations.xml diff --git a/pisilinux-dev-tools/actions.py b/pisilinux-dev-tools/actions.py deleted file mode 100644 index 5f98e7ca..00000000 --- a/pisilinux-dev-tools/actions.py +++ /dev/null @@ -1,12 +0,0 @@ -#!/usr/bin/python -# -*- coding: utf-8 -*- -# -# Licensed under the GNU General Public License, version 3. -# See the file http://www.gnu.org/licenses/gpl.txt - -from pisi.actionsapi import pisitools - -def install(): - pisitools.dobin("scripts/*") - - pisitools.dodoc("COPYING", "README", "TODO") diff --git a/pisilinux-dev-tools/files/fix_detect_mesa.patch b/pisilinux-dev-tools/files/fix_detect_mesa.patch deleted file mode 100644 index 0e4de3b2..00000000 --- a/pisilinux-dev-tools/files/fix_detect_mesa.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- scripts/checkelf.old 2014-04-25 17:57:56.000000000 +0200 -+++ scripts/checkelf 2014-06-15 15:29:21.932687493 +0200 -@@ -150,7 +150,11 @@ - for elf_files, paths_and_deps in result_dependencies.items(): - for data in paths_and_deps: - if not data[1] == "broken" and not data[1] == package_name and not data[1] == "glibc": -- result_deps.append(data[1]) -+ if (data[1].startswith("xorg-video-nvidia") or data[1].startswith("xorg-video-fglrx")) \ -+ and not (package_name.startswith("xorg-video-nvidia") or package_name.startswith("xorg-video-fglrx")): -+ result_deps.append("mesa") -+ else: -+ result_deps.append(data[1]) - - # remove packages that belong to system.base component - # when -s is used, systembase is set to true diff --git a/pisilinux-dev-tools/files/ignore_glibc-32bit.patch b/pisilinux-dev-tools/files/ignore_glibc-32bit.patch deleted file mode 100644 index 489bb23c..00000000 --- a/pisilinux-dev-tools/files/ignore_glibc-32bit.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- scripts/checkelf~ 2014-09-21 16:43:07.997559352 +0200 -+++ scripts/checkelf 2014-09-21 16:43:31.069558509 +0200 -@@ -157,7 +157,7 @@ - result_deps = [] - for elf_files, paths_and_deps in result_dependencies.items(): - for data in paths_and_deps: -- if not data[1] == "broken" and not data[1] == package_name and not data[1] == "glibc": -+ if not data[1] == "broken" and not data[1] == package_name and not data[1].replace("32-bit", "") == "glibc": - if (data[1].startswith("xorg-video-nvidia") or data[1].startswith("xorg-video-fglrx")) \ - and not (package_name.startswith("xorg-video-nvidia") or package_name.startswith("xorg-video-fglrx")): - result_deps.append("mesa") diff --git a/pisilinux-dev-tools/files/spped_up.patch b/pisilinux-dev-tools/files/spped_up.patch deleted file mode 100644 index 15bf05d3..00000000 --- a/pisilinux-dev-tools/files/spped_up.patch +++ /dev/null @@ -1,57 +0,0 @@ ---- scripts/checkelf.old 2014-06-19 18:50:10.499728066 +0200 -+++ scripts/checkelf 2014-06-19 18:47:59.408732856 +0200 -@@ -26,6 +26,7 @@ - import itertools - import subprocess - -+FILESDB = pisi.db.filesldb.FilesLDB() - INSTALLDB = pisi.db.installdb.InstallDB() - CONSTANTS = pisi.constants.Constants() - CMPFILTR = re.compile("(.*?)(\s*\((base|devel)\)\s*)$") -@@ -73,6 +74,7 @@ - # result_undefined = undefined symbol errors - return (result_needed, result_broken, result_unused, result_undefined) - -+found_objdump = [] - def check_objdump(processed_needed, package_elf_files, package_name): - '''check the objdump needed libraries with the ldd libraries - the libraries that are needed can be used for dependencies''' -@@ -86,14 +88,18 @@ - else: - # search for the package name (i.e: pisi sf /usr/lib/*.so ) - # the library may not exist, thus adding an exception is welcome -+ if objdump_needed.startswith("/"): objdump_needed = objdump_needed[1:] -+ if objdump_needed in found_objdump: continue - try: -- dependency_name = pisi.api.search_file(objdump_needed)[0][0] -+ dependency_name = FILESDB.search_file(objdump_needed)[0][0] -+ found_objdump.extend([x.path for x in INSTALLDB.get_files(dependency_name).list]) - except IndexError: - dependency_name = "broken" - #print "%s (probably broken dependency)" % needed - result_needed.append((objdump_needed, dependency_name)) - return result_needed - -+found_pc_files = [] - def check_pc_files(pc_file): - '''check for .pc files created by pkgconfig and shipped with the package - these .pc files have requirements tags that can be used for dependencies''' -@@ -102,12 +108,14 @@ - os.path.basename(pc_file).replace(".pc", "")).read().split("\n")[:-1]) - - for require in requires: -- require_file = "/usr/share/pkgconfig/%s.pc" % require -+ require_file = "usr/share/pkgconfig/%s.pc" % require - -- if not os.path.exists(require_file): -- require_file = "/usr/lib/pkgconfig/%s.pc" % require -+ if not os.path.exists("/%s" % require_file): -+ require_file = "usr/lib/pkgconfig/%s.pc" % require -+ if require_file in found_pc_files: continue - try: -- dependency_name = pisi.api.search_file(require_file)[0][0] -+ dependency_name = FILESDB.search_file(require_file)[0][0] -+ found_pc_files.extend([x.path for x in INSTALLDB.get_files(dependency_name).list]) - except IndexError: - dependency_name = "broken" - diff --git a/pisilinux-dev-tools/pspec.xml b/pisilinux-dev-tools/pspec.xml deleted file mode 100644 index 58b221b6..00000000 --- a/pisilinux-dev-tools/pspec.xml +++ /dev/null @@ -1,100 +0,0 @@ - - - - - pisilinux-dev-tools - http://www.pisilinux.org - - Marcin Bojara - marcin@pisilinux.org - - GPLv2 - app:console - A collection of useful tools that Pisi Linux developers use to make their developing work a lot easier - Pisilinux-dev-tools is a collection of useful tools that Pisilinux developers use to make their developing work a lot easier. Such tools can include packaging preparation, package analysis, etc. - http://source.pisilinux.org/1.0/pisilinux-dev-tools-0.0.2.tar.xz - - fix_detect_mesa.patch - spped_up.patch - ignore_glibc-32bit.patch - - - - - pisilinux-dev-tools - - chrpath - binutils - - - /usr/bin - /usr/share/doc - - - - - - 2015-06-28 - 0.0.2 - fix runtime deps. - Ertuğrul Erata - ertugrulerata@gmail.com - - - 2014-09-21 - 0.0.2 - checkelf: ignore glibc-32bit - Marcin Bojara - marcin@pisilinux.org - - - 2014-07-01 - 0.0.2 - rebuild. - Marcin Bojara - marcin@pisilinux.org - - - 2014-06-19 - 0.0.2 - Speed up checkelf. - Marcin Bojara - marcin@pisilinux.org - - - 2014-06-16 - 0.0.2 - checkelf: fix detect mesa. - Marcin Bojara - marcin@pisilinux.org - - - 2014-04-11 - 0.0.2 - Version bump. - Marcin Bojara - marcin@pisilinux.org - - - 2014-04-03 - 0.0.1 - Use re.search() for checking command file output. - Marcin Bojara - marcin@pisilinux.org - - - 2013-10-29 - 0.0.1 - Rebuild - Pisi Linux Admins - admins@pisilinux.org - - - 2011-05-23 - 0.0.1 - First release - Pisi Linux Admins - admins@pisilinux.org - - - diff --git a/pisilinux-dev-tools/translations.xml b/pisilinux-dev-tools/translations.xml deleted file mode 100644 index 2644cae6..00000000 --- a/pisilinux-dev-tools/translations.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - Pisilinux-dev-tools - Pisilinux geliştiricilerinin geliştirme yaparken işlerini kolaylaştıran araçların bazılarını içeren bir paket - Pisilinux-dev-tools, Pisilinux geliştiricilerinin geliştirme yaparken işlerini kolaylaştıran araçların bazılarını içeren bir pakettir. Paket yapımı, paket analizi, ELF dosyalarının analizi gibi araçlar bulunmaktadır. - - \ No newline at end of file