Zypper removal

deleted file mode 100644
index 8312a97..0000000
@@ -1,22 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
-without the patch, /usr/include/rpm/ won't be added
-in cppflags
-
-8/19/2010 - created by Qing He <[email protected]>
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 6b040a6..04a1595 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -21,6 +21,10 @@ SET( CMAKE_C_FLAGS   "${CMAKE_C_FLAGS}   -g -O2 -Wall -fstack-protector" )
- 
- GENERATE_PACKAGING(${PACKAGE} ${VERSION})
- 
-+FIND_PACKAGE(PkgConfig REQUIRED)
-+PKG_CHECK_MODULES(RPM REQUIRED rpm)
-+INCLUDE_DIRECTORIES( ${RPM_INCLUDE_DIRS} )
-+
- FIND_PACKAGE( Zypp REQUIRED )
- IF( ZYPP_FOUND )
-   INCLUDE_DIRECTORIES(${ZYPP_INCLUDE_DIR})

deleted file mode 100644
index 8cda7a4..0000000
@@ -1,28 +0,0 @@
-Upstream-Status: Pending
-
-Signed-off-by: Saul Wold <[email protected]>
-
-Index: git/CMakeLists.txt
-===================================================================
---- git.orig/CMakeLists.txt	2011-12-20 15:13:59.851209493 -0800
-+++ git/CMakeLists.txt	2011-12-20 15:14:51.167211302 -0800
-@@ -25,6 +25,9 @@
- PKG_CHECK_MODULES(RPM REQUIRED rpm)
- INCLUDE_DIRECTORIES( ${RPM_INCLUDE_DIRS} )
- 
-+PKG_CHECK_MODULES(LIBXML REQUIRED libxml-2.0)
-+INCLUDE_DIRECTORIES( ${LIBXML_INCLUDE_DIRS} )
-+
- FIND_PACKAGE( Zypp REQUIRED )
- IF( ZYPP_FOUND )
-   INCLUDE_DIRECTORIES(${ZYPP_INCLUDE_DIR})
-@@ -70,6 +73,9 @@
- INCLUDE(CTest)
- ENABLE_TESTING()
- 
-+# New Augeas requires libxml now
-+PKG_CHECK_MODULES(LIBXML REQUIRED libxml-2.0)
-+INCLUDE_DIRECTORIES( ${LIBXML_INCLUDE_DIRS} )
- 
- # documentation too important to be hidden in doc:
- INSTALL(

60 lines not on this page · raw message

deleted file mode 100644
index a35c0d9..0000000
@@ -1,20 +0,0 @@
-Fix errors like below
-
-| /home/kraj/work/openembedded-core/build/tmp-eglibc/work/qemumips-oe-linux/zypper-1.5.3-git1+2c5bb6ceb99ecd950ef993e43d77bf0569ea0582-r1/git/src/utils/console.cc:55:8: error: '::isatty' has not been declared                                                                                                                                                  
-| /home/kraj/work/openembedded-core/build/tmp-eglibc/work/qemumips-oe-linux/zypper-1.5.3-git1+2c5bb6ceb99ecd950ef993e43d77bf0569ea0582-r1/git/src/utils/console.cc:55:17: error: 'STDOUT_FILENO' was not declared in this scope                                                                                                                                   
-
-Signed-off-by: Khem Raj <[email protected]>
-
-Upstream-Status: Pending
-Index: git/src/utils/console.cc
-===================================================================
---- git.orig/src/utils/console.cc	2012-03-27 19:12:06.171036356 -0700
-+++ git/src/utils/console.cc	2012-03-27 19:12:52.887038622 -0700
-@@ -15,6 +15,7 @@
- #include <readline/readline.h>
- #include <readline/history.h>
- #include <cstdlib>
-+#include <unistd.h>
- 
- using namespace std;
- 

deleted file mode 100644
index 89564a6..0000000
@@ -1,18 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
-It's required by libzypp headers
-
-Signed-off-by: Qing He <[email protected]>
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 6b040a6..84431c8 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -15,6 +15,7 @@ INCLUDE( ${ZYPPER_SOURCE_DIR}/VERSION.cmake )
- SET( VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}" )
- ADD_DEFINITIONS( -D_FILE_OFFSET_BITS=64 )
- ADD_DEFINITIONS( -DVERSION="${VERSION}" )
-+ADD_DEFINITIONS( -D_RPM_5 )
- 
- SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O2 -Wall -Woverloaded-virtual -fstack-protector" )
- SET( CMAKE_C_FLAGS   "${CMAKE_C_FLAGS}   -g -O2 -Wall -fstack-protector" )

deleted file mode 100644
index a750a3b..0000000
@@ -1,23 +0,0 @@
-rpmatch() is missing in uclibc so we provide a local definition
-in form of a macro
-
-Signed-off-by: Khem Raj <[email protected]>
-Upstream-Status: Pending
-
-Index: git/src/utils/prompt.h
-===================================================================
---- git.orig/src/utils/prompt.h	2012-06-06 15:51:00.899112775 -0700
-+++ git/src/utils/prompt.h	2012-06-06 15:52:17.003116762 -0700
-@@ -172,4 +172,12 @@
-   return errstr;
- }
- 
-+#ifdef __UCLIBC__
-+#define rpmatch(line) \
-+       ( (line == NULL)? -1 : \
-+         (*line == 'y' || *line == 'Y')? 1 : \
-+         (*line == 'n' || *line == 'N')? 0 : \
-+         -1 )
-+#endif /* __UCLIBC__ */
-+
- #endif /*ZYPPERPROMPT_H_*/

deleted file mode 100644
index c5d7c61..0000000
@@ -1,29 +0,0 @@
-HOMEPAGE = "http://gitorious.org/opensuse/zypper"
-DESCRIPTION  = "The ZYpp Linux Software management framework"
-
-LICENSE  = "GPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=3201406e350b39e05a82e28b5020f413"
-
-DEPENDS  = "libzypp augeas"
-PR = "r3"
-SRCREV = "2c5bb6ceb99ecd950ef993e43d77bf0569ea0582"
-
-inherit cmake
-
-SRC_URI = "git://github.com/openSUSE/zypper.git;protocol=git \
-           file://cmake.patch \
-           file://cmake_libxml2.patch \
-           file://dso_linking_change_build_fix.patch \
-           file://rpm5-flag.patch \
-           file://gcc-scope.patch \
-           file://rpmatch.patch \
-          "
-S = "${WORKDIR}/git"
-
-PV = "1.5.3-git${SRCPV}"
-
-RDEPENDS_${PN} = "rpm-libs"
-RRECOMMENDS_${PN} = "procps util-linux-uuidgen"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-OECMAKE_CXX_LINK_FLAGS_libc-uclibc += "-lintl"

deleted file mode 100644
index bfdb29b..0000000
@@ -1,71 +0,0 @@
-Upstream-Status: Pending
-
-Workaround a problem with the C++ global constructors on ARM.
-
-As documented in the Yocto Bugzilla bug 938, the global constructors 
-that define DEF_BUILTIN [const IdString _foo ( "foo" );] are not running 
-before the usage of _foo during the initialization of the compatibility 
-table.
-
-The patch, along with a similar change to the recipe generation of the 
-oe-arch.h file, remove the DEF_BUILTIN globals and replace them with
-immediate strings wherever they are used.
-
-Signed-off-by: Mark Hatle <[email protected]>
-
-Index: git/zypp/Arch.cc
-===================================================================
---- git.orig/zypp/Arch.cc	2011-08-04 21:03:31.000000000 -0700
-+++ git/zypp/Arch.cc	2011-08-04 21:04:16.635480895 -0700
-@@ -152,13 +152,10 @@
-     // NOTE: Thake care CompatBits::IntT is able to provide one
-     //       bit for each architecture.
-     //
--#define DEF_BUILTIN(A) const IdString  _##A( #A );
--    DEF_BUILTIN( all );
--    DEF_BUILTIN( any );
--    DEF_BUILTIN( noarch );
-+/* Global constructors are not working properly on ARM, avoid the
-+ * known bad case and merge constructors in with the usages
-+ */
- 
--#include "oe-arch.h"
--#undef DEF_BUILTIN
- 
-     ///////////////////////////////////////////////////////////////////
-     //
-@@ -227,9 +224,9 @@
-         // _noarch must have _idBit 0.
-         // Other builtins have 1-bit set
-         // and are initialized done on the fly.
--        _compatSet.insert( Arch::CompatEntry( _all, 0 ) );
--        _compatSet.insert( Arch::CompatEntry( _any, 0 ) );
--        _compatSet.insert( Arch::CompatEntry( _noarch, 0 ) );
-+        _compatSet.insert( Arch::CompatEntry( IdString ( "all" ), 0 ) );
-+        _compatSet.insert( Arch::CompatEntry( IdString ( "any" ), 0 ) );
-+        _compatSet.insert( Arch::CompatEntry( IdString ( "noarch" ), 0 ) );
-         ///////////////////////////////////////////////////////////////////
-         // Define the CompatibleWith relation:
-         //
-@@ -331,9 +328,9 @@
-   ///////////////////////////////////////////////////////////////////
- 
-   const Arch Arch_empty ( IdString::Empty );
--  const Arch Arch_all( _all );
--  const Arch Arch_any( _any );
--  const Arch Arch_noarch( _noarch );
-+  const Arch Arch_all( IdString ( "all" ) );
-+  const Arch Arch_any( IdString ( "any" ) );
-+  const Arch Arch_noarch( IdString ( "noarch" ) );
- 
- #define OE_PROTO 1
- #include "oe-arch.h"
-@@ -345,7 +342,7 @@
-   //	METHOD TYPE : Ctor
-   //
-   Arch::Arch()
--  : _entry( &ArchCompatSet::instance().assertDef( _noarch ) )
-+  : _entry( &ArchCompatSet::instance().assertDef( IdString ( "noarch" ) ) )
-   {}
- 
-   Arch::Arch( IdString::IdType id_r )

deleted file mode 100644
index 0ff1825..0000000
@@ -1,32 +0,0 @@
-close() is used without a protype therefore we include unistd.h
-Fixes compile errors like below
-
-/home/kraj/work/openembedded-core/build/tmp-eglibc/work/qemuppc-oe-linux/libzypp-0.0-git1+15b6c52260bbc52b3d8e585e271b67e10cc7c433-r18/git/zypp/ExternalProgram.h:239:47: error: '::close' has not been declared
-
-Signed-off-by: Khem Raj <[email protected]>
-
-Upstream-Status: Pending
-Index: git/zypp/ExternalProgram.h
-===================================================================
---- git.orig/zypp/ExternalProgram.h	2012-03-23 08:27:31.716438539 -0700
-+++ git/zypp/ExternalProgram.h	2012-03-23 08:27:54.520439367 -0700
-@@ -16,6 +16,7 @@
- #include <map>
- #include <string>
- #include <vector>
-+#include <unistd.h>
- 
- #include "zypp/base/ExternalDataSource.h"
- #include "zypp/Pathname.h"
-Index: git/zypp/base/Random.cc
-===================================================================
---- git.orig/zypp/base/Random.cc	2012-03-23 08:31:09.732449118 -0700
-+++ git/zypp/base/Random.cc	2012-03-23 08:31:36.240450324 -0700
-@@ -3,6 +3,7 @@
- #include <cstdio>
- #include <iostream>
- #include <fcntl.h>
-+#include <unistd.h>
- #include "zypp/base/Random.h"
- 
- using namespace std;

deleted file mode 100644
index 26c7307..0000000
@@ -1,23 +0,0 @@
-Upstream-Status: Inappropriate [distribution]
-
-Configure distro version package
-
-We need to configure a package that the system can use to determine the
-system distribution version.
-
-Hack: for now set to packagegroup-core-rpm.
-
-Signed-off-by: Mark Hatle <[email protected]>
-
-diff -ur git.orig/zypp/ZConfig.cc git/zypp/ZConfig.cc
---- git.orig/zypp/ZConfig.cc	2011-03-14 16:30:07.492786134 -0500
-+++ git/zypp/ZConfig.cc	2011-03-15 11:39:15.396801927 -0500
-@@ -821,7 +821,7 @@
-   ///////////////////////////////////////////////////////////////////
- 
-   std::string ZConfig::distroverpkg() const
--  { return "redhat-release"; }
-+  { return "packagegroup-core-rpm"; }
- 
-   ///////////////////////////////////////////////////////////////////
- 

49 lines not on this page · raw message

deleted file mode 100644
index 0f17b48..0000000
@@ -1,22 +0,0 @@
-Upstream-Status: Pending
-
-Fix following compilation errors with gcc 4.6.0
-Nitin A Kamble <[email protected]> 2011/05/09
-
-| i586-poky-linux-g++: error: unrecognized option '--as-needed'
-| make[2]: *** [zypp/libzypp.so.810.1.0] Error 1
-
-
-Index: git/zypp/CMakeLists.txt
-===================================================================
---- git.orig/zypp/CMakeLists.txt
-+++ git/zypp/CMakeLists.txt
-@@ -903,7 +903,7 @@ SET_LOGGROUP( "satsolver" ${zypp_sat_SRC
- ADD_LIBRARY(zypp SHARED ${zypp_lib_SRCS})
- SET_TARGET_PROPERTIES( zypp PROPERTIES VERSION "${LIBZYPP_VERSION_INFO}" )
- SET_TARGET_PROPERTIES( zypp PROPERTIES SOVERSION "${LIBZYPP_SOVERSION_INFO}" )
--SET_TARGET_PROPERTIES( zypp PROPERTIES LINK_FLAGS "--as-needed" )
-+SET_TARGET_PROPERTIES( zypp PROPERTIES LINK_FLAGS "-Wl,--as-needed" )
- ADD_DEPENDENCIES(zypp schema_header)
- # System libraries
- SET(UTIL_LIBRARY util)

deleted file mode 100644
index c11f5c5..0000000
@@ -1,22 +0,0 @@
-tools/CMakeLists.txt: replace the hardcode "lib"
-
-replace the hardcode "lib" with LIB_INSTALL_DIR
-this will work with non /usr/lib libdir case
-
-Upstream-Status: Pending
-
-Signed-off-by: Yu Ke <[email protected]>
-
-Index: libzypp/tools/CMakeLists.txt
-===================================================================
---- libzypp.orig/tools/CMakeLists.txt
-+++ libzypp/tools/CMakeLists.txt
-@@ -1,7 +1,7 @@
- 
- ADD_SUBDIRECTORY( package-manager )
- 
--INSTALL( FILES notify-message DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/zypp" )
-+INSTALL( FILES notify-message DESTINATION "${LIB_INSTALL_DIR}/zypp" )
- 
- ## ############################################################
- 

54 lines not on this page · raw message

500 lines not on this page · raw message

deleted file mode 100644
index 7244284..0000000
@@ -1,32 +0,0 @@
-commit 6c47ad415246cc3a3edac2e1637106d330574c85
-Author: Mark Hatle <[email protected]>
-Date:   Fri May 11 19:05:09 2012 -0500
-
-    RpmHeader.cc: RPM 5.4.9 integration
-    
-    _RPMVSF_xxx - NODIGEST, NOSIGNATURES, NOHEADER, and NOPAYLOAD
-    are now obsolete and no longer supported.
-
-    Upstream-Status: Inappropriate [other]
-      OE version is too old, when we uprev if this patch is still need it
-      should be sent upstream at that time.
-    
-    Signed-off-by: Mark Hatle <[email protected]>
-
-diff --git a/zypp/target/rpm/RpmHeader.cc b/zypp/target/rpm/RpmHeader.cc
-index 1224ecd..c96dae6 100644
---- a/zypp/target/rpm/RpmHeader.cc
-+++ b/zypp/target/rpm/RpmHeader.cc
-@@ -230,10 +230,12 @@ RpmHeader::constPtr RpmHeader::readPackage( const Pathname & path_r,
-   librpmDb::globalInit();
-   rpmts ts = ::rpmtsCreate();
-   unsigned vsflag = RPMVSF_DEFAULT;
-+#if !defined(_RPM_5)
-   if ( verification_r & NODIGEST )
-     vsflag |= _RPMVSF_NODIGESTS;
-   if ( verification_r & NOSIGNATURE )
-     vsflag |= _RPMVSF_NOSIGNATURES;
-+#endif
-   ::rpmtsSetVSFlags( ts, rpmVSFlags(vsflag) );
- 
-   Header nh = 0;

deleted file mode 100644
index d01ef70..0000000
@@ -1,24 +0,0 @@
-Upstream-Status: Pending
-
-# with gcc 4.3.3 and MIPS target, gcc "internal compiler error: segmentation fault" error
-# occurs when compiling Applydeltarpm.cc. I didn't find the exact reason leading to this
-# error, but it should be related to how boost tribool type is interpreted by g++. So provide
-# this mips workaround for now. We'll come back later to check whether it's still required after
-# upgrading to 4.5.0.
-#
-# Signed-off-by Kevin Tian <[email protected]>, 2010-09-08
-
-diff --git a/zypp/repo/Applydeltarpm.cc b/zypp/repo/Applydeltarpm.cc
-index 7b382be..0d7a1f8 100644
---- a/zypp/repo/Applydeltarpm.cc
-+++ b/zypp/repo/Applydeltarpm.cc
-@@ -77,7 +77,8 @@ namespace zypp
-       else
-         {
-           // _last is 'indeterminate' or '!have'
--          if ( (_last = have) )
-+          _last = have;
-+          if ( _last )
-             MIL << "Found executable " << prog << endl;
-           else
-             WAR << "No executable " << prog << endl;

deleted file mode 100644
index c7e6e92..0000000
@@ -1,33 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
-not building doc (doxygen based)
-
-8/19/2010 - created by Qing He <[email protected]>
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 0629b1f..41746cc 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -110,13 +110,6 @@ FIND_PACKAGE(EXPAT REQUIRED)
- FIND_PACKAGE(OpenSSL REQUIRED)
- FIND_PACKAGE(Udev REQUIRED)
- 
--FIND_PROGRAM( DOXYGEN doxygen )
--IF ( NOT DOXYGEN )
--  MESSAGE( FATAL_ERROR "doxygen not found: install doxygen to build the documentation." )
--ELSE ( NOT DOXYGEN )
--  MESSAGE( STATUS "doxygen found: ${DOXYGEN}" )
--ENDIF ( NOT DOXYGEN )
--
- MESSAGE(STATUS "soname: ${LIBZYPP_VERSION_INFO}")
- MESSAGE(STATUS "version: ${VERSION}")
- 
-@@ -154,7 +147,7 @@ ADD_SUBDIRECTORY( devel EXCLUDE_FROM_ALL )
- ADD_SUBDIRECTORY( tools )
- ADD_SUBDIRECTORY( examples )
- ADD_SUBDIRECTORY( po EXCLUDE_FROM_ALL )
--ADD_SUBDIRECTORY( doc )
-+#ADD_SUBDIRECTORY( doc )
- ADD_SUBDIRECTORY( vendor )
- ADD_SUBDIRECTORY( tests EXCLUDE_FROM_ALL )
- 

deleted file mode 100644
index 7006203..0000000
@@ -1,27 +0,0 @@
-Upstream-Status: Pending
-
-diff --git a/zypp/target/rpm/librpmDb.cc b/zypp/target/rpm/librpmDb.cc
-index 1689fbb..4999cd9 100644
---- a/zypp/target/rpm/librpmDb.cc
-+++ b/zypp/target/rpm/librpmDb.cc
-@@ -60,20 +60,6 @@ public:
-     const char * root = ( _root == "/" ? NULL : _root.asString().c_str() );
-     int          perms = 0644;
- 
--    // check whether to create a new db
--    PathInfo master( _root + _dbPath + "Packages" );
--    if ( ! master.isFile() )
--    {
--      // init database
--      int res = ::rpmdbInit( root, perms );
--      if ( res )
--      {
--        ERR << "rpmdbInit error(" << res << "): " << *this << endl;
--        _error = shared_ptr<RpmInitException>(new RpmInitException(_root, _dbPath));
--        ZYPP_THROW(*_error);
--      }
--    }
--
-     // open database
-     int res = ::rpmdbOpen( root, &_db, (readonly_r ? O_RDONLY : O_RDWR ), perms );
-     if ( res || !_db )

deleted file mode 100644
index bf3da24..0000000
@@ -1,32 +0,0 @@
-Upstream-Status: Pending
-
-build fix for rpm5
-
-8/19/2010 - created by Qing He <[email protected]>
-
-diff --git a/zypp/target/rpm/BinHeader.cc b/zypp/target/rpm/BinHeader.cc
-index e9ad382..86a9c96 100644
---- a/zypp/target/rpm/BinHeader.cc
-+++ b/zypp/target/rpm/BinHeader.cc
-@@ -19,7 +19,7 @@ extern "C"
- 
- #ifndef _RPM_4_4_COMPAT
- #ifdef _RPM_5
--typedef rpmuint32_t rpm_count_t;
-+typedef uint32_t rpm_count_t;
- #else
- typedef int32_t rpm_count_t;
- #endif
-diff --git a/zypp/target/rpm/librpmDb.cv3.cc b/zypp/target/rpm/librpmDb.cv3.cc
-index bf18e45..5454ea9 100644
---- a/zypp/target/rpm/librpmDb.cv3.cc
-+++ b/zypp/target/rpm/librpmDb.cv3.cc
-@@ -14,7 +14,7 @@ extern "C"
- {
- #ifndef _RPM_4_4_COMPAT
- #ifdef _RPM_5
--typedef rpmuint32_t rpm_count_t;
-+typedef uint32_t rpm_count_t;
- #else
- typedef int32_t rpm_count_t;
- #endif

160 lines not on this page · raw message

deleted file mode 100644
index 402d16e..0000000
@@ -1,57 +0,0 @@
-From bbbb4fb9b7c85fde90608710dff09480696c6567 Mon Sep 17 00:00:00 2001
-From: Khem Raj <[email protected]>
-Date: Thu, 9 Feb 2012 16:01:56 -0800
-Subject: [PATCH] sat_xfopen.c: Forward port to zlib 1.2.6 gzFile
-
-Signed-off-by: Khem Raj <[email protected]>
-
-Upstream-Status: Pending
----
- ext/sat_xfopen.c |   10 +++++-----
- 1 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/ext/sat_xfopen.c b/ext/sat_xfopen.c
-index cf943cf..b3d458d 100644
---- a/ext/sat_xfopen.c
-+++ b/ext/sat_xfopen.c
-@@ -16,16 +16,16 @@
- 
- static ssize_t cookie_gzread(void *cookie, char *buf, size_t nbytes)
- {
--  return gzread((gzFile *)cookie, buf, nbytes);
-+  return gzread((gzFile)cookie, buf, nbytes);
- }
- 
- static int
- cookie_gzclose(void *cookie)
- {
--  return gzclose((gzFile *)cookie);
-+  return gzclose((gzFile)cookie);
- }
- 
--static FILE *mygzfopen(gzFile* gzf)
-+static FILE *mygzfopen(gzFile gzf)
- {
- #ifdef HAVE_FUNOPEN
-   return funopen(
-@@ -49,7 +49,7 @@ FILE *
- sat_xfopen(const char *fn, const char *mode)
- {
-   char *suf;
--  gzFile *gzf;
-+  gzFile gzf;
- 
-   if (!fn)
-     return 0;
-@@ -68,7 +68,7 @@ FILE *
- sat_xfopen_fd(const char *fn, int fd, const char *mode)
- {
-   char *suf;
--  gzFile *gzf;
-+  gzFile gzf;
- 
-   suf = fn ? strrchr(fn, '.') : 0;
-   if (!mode)
--- 
-1.7.5.4
-

deleted file mode 100644
index c1ec86a..0000000
@@ -1,31 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
-Enable debugging for all builds
-not building docs (need oxygen)
-
-8/19/2010 - created by Qing He <[email protected]>
-1/24/2011 - Disable Fedora/Debian checking/settings by Mark Hatle <[email protected]>
-3/15/2011 - Updated to newer version of sat-solver by Mark Hatle <[email protected]>
-3/16/2011 - Split original patch and simplify by Mark Hatle <[email protected]>
-
-diff -ur git.orig2/CMakeLists.txt git/CMakeLists.txt
---- git.orig2/CMakeLists.txt	2011-03-16 16:29:43.532032285 -0500
-+++ git/CMakeLists.txt	2011-03-16 16:32:59.982034501 -0500
-@@ -177,7 +177,7 @@
- 
- MESSAGE(STATUS "Looking modules in ${CMAKE_MODULE_PATH}")
- 
--set ( CMAKE_C_FLAGS     "${CMAKE_C_FLAGS} -Werror -Wall" )
-+set ( CMAKE_C_FLAGS     "${CMAKE_C_FLAGS} -Werror -Wall -g" )
- set ( CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS} -g -O3" )
- set ( CMAKE_C_FLAGS_DEBUG     "${CMAKE_C_FLAGS} -g3 -O0" )
- 
-@@ -186,7 +186,7 @@
- ADD_SUBDIRECTORY(tools)
- ADD_SUBDIRECTORY(tests)
- ADD_SUBDIRECTORY(examples)
--ADD_SUBDIRECTORY(doc)
-+#ADD_SUBDIRECTORY(doc)
- 
- MESSAGE(STATUS "version: ${VERSION}")
- 

deleted file mode 100644
index 6b67912..0000000
@@ -1,26 +0,0 @@
-Upstream-Status: Pending
-
-RPM no longer includes an internal version of db, it now relies on the system
-version.  The system version in Poky is available at /usr/include/db51
-
-Signed-off-by: Mark Hatle <[email protected]>
-
-rebased to sat-solver commit 9e1f2a097965debebc69cebf8ed73c6ff31a5220
-
-Signed-off-by: Qing He <[email protected]>
-
---- git/ext/repo_rpmdb.c.orig	2011-01-06 10:46:37.369900542 -0600
-+++ git/ext/repo_rpmdb.c	2011-01-06 10:48:35.482919434 -0600
-@@ -29,11 +29,7 @@
- #include <rpm/rpmdb.h>
- 
- #ifndef DB_CREATE
--# ifdef FEDORA
--#  include <db.h>
--# else
--#  include <rpm/db.h>
--# endif
-+#  include <db.h>
- #endif
- 
- #include "pool.h"

115 lines not on this page · raw message

deleted file mode 100644
index b24d852..0000000
@@ -1,32 +0,0 @@
-This patch uses utimes instead of futimes for uclibc
-since futimes is not available
-
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <[email protected]>
-
-Index: git/examples/solv.c
-===================================================================
---- git.orig/examples/solv.c	2012-06-01 12:06:22.041552848 -0700
-+++ git/examples/solv.c	2012-06-01 12:49:17.417677449 -0700
-@@ -1027,7 +1027,8 @@
-   int flags;
- 
-   cinfo = repo->appdata;
--  if (!(fp = fopen(calccachepath(repo, repoext), "r")))
-+  const char* fname = calccachepath(repo, repoext);
-+  if (!(fp = fopen(fname, "r")))
-     return 0;
-   if (fseek(fp, -sizeof(mycookie), SEEK_END) || fread(mycookie, sizeof(mycookie), 1, fp) != 1)
-     {
-@@ -1068,7 +1069,11 @@
-       memcpy(cinfo->extcookie, myextcookie, sizeof(myextcookie));
-     }
-   if (mark)
-+#ifdef __UCLIBC__
-+    utimes(fname, 0);	/* try to set modification time */
-+#else
-     futimes(fileno(fp), 0);	/* try to set modification time */
-+#endif
-   fclose(fp);
-   return 1;
- }

127 lines not on this page · raw message

deleted file mode 100644
index 60483e9..0000000
@@ -1,22 +0,0 @@
-Upstream-Status: Pending
-
-Fix obsolete settings with RPM5.
-
-The following patch is from Michael Schroeder <[email protected]>
-
-Signed-off-by: Mark Hatle <[email protected]>
-
-diff -ur git.orig/src/pool.c git/src/pool.c
---- git.orig/src/pool.c	2011-03-25 15:49:34.885834194 -0500
-+++ git/src/pool.c	2011-03-28 10:55:13.138786524 -0500
-@@ -70,6 +70,10 @@
-   pool->disttype = DISTTYPE_DEB;
- # endif
- #endif
-+#ifdef RPM5
-+  pool->obsoleteusesprovides = 1;
-+  pool->implicitobsoleteusesprovides = 1;
-+#endif
-   return pool;
- }
- 

69 lines not on this page · raw message

67 lines not on this page · raw message

index ba30f01..124a090 100644
@@ -40,9 +40,6 @@ PARALLEL_MAKE_pn-libgcrypt = ""
 PARALLEL_MAKE_pn-gpgme = ""
 PARALLEL_MAKE_pn-udev = ""
 PARALLEL_MAKE_pn-gnutls = ""
-PARALLEL_MAKE_pn-sat-solver = ""
-PARALLEL_MAKE_pn-libzypp = ""
-PARALLEL_MAKE_pn-zypper = ""
 
 python() {
     # NOTE: It might be useful to detect host infection on native and cross

index f3fa546..64bc714 100644
@@ -1,5 +1,5 @@
 DESCRIPTION  = "Check Test Framework"
-HOMEPAGE = "http://gitorious.org/opensuse/zypper"
+HOMEPAGE = "http://check.sourceforge.net/"
 SECTION = "devel"
 
 LICENSE  = "LGPLv2.1+"