* [PATCH 0/5] Zypper removal
@ 2013-01-23 12:10 Paul Eggleton
2013-01-23 12:10 ` [PATCH 1/5] zypper: remove Paul Eggleton
` (4 more replies)
0 siblings, 5 replies; 6+ messages in thread
From: Paul Eggleton @ 2013-01-23 12:10 UTC (permalink / raw)
To: openembedded-core
The following changes since commit ffab86f13cafb10d8d6273b6af8cd9a3c84eae20:
prserv: add LOCALCOUNT to AUTOINCs migration feature (2013-01-22 16:01:17 +0000)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib paule/zypper-remove
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=paule/zypper-remove
Paul Eggleton (5):
zypper: remove
libzypp: remove
sat-solver: remove
classes/image-swab: remove zypper-related references
libcheck: fix HOMEPAGE
meta/classes/image-swab.bbclass | 3 -
.../arm-workaround-global-constructor.patch | 71 ---
meta/recipes-extended/libzypp/libzypp/close.patch | 32 --
.../libzypp/libzypp/config-release.patch | 23 -
meta/recipes-extended/libzypp/libzypp/cstdio.patch | 49 --
.../libzypp/fix_for_compile_wth_gcc-4.6.0.patch | 22 -
.../libzypp/libzypp/hardcode-lib-fix.patch | 22 -
.../libzypp/libzypp/libzypp-compatargs.patch | 54 ---
.../libzypp/libzypp/libzypp-oearch.patch | 500 --------------------
.../libzypp/libzypp/libzypp-rpm549.patch | 32 --
.../mips-workaround-gcc-tribool-error.patch | 24 -
meta/recipes-extended/libzypp/libzypp/no-doc.patch | 33 --
.../libzypp/libzypp/rpm5-no-rpmdbinit.patch | 27 --
meta/recipes-extended/libzypp/libzypp/rpm5.patch | 32 --
meta/recipes-extended/libzypp/libzypp_git.bb | 160 -------
...fopen.c-Forward-port-to-zlib-1.2.6-gzFile.patch | 57 ---
.../sat-solver/sat-solver/cmake.patch | 31 --
.../sat-solver/sat-solver/db5.patch | 26 -
.../sat-solver/fix_gcc-4.6.0_compile_issue.patch | 115 -----
.../sat-solver/sat-solver/futimes.patch | 32 --
.../sat-solver/sat-solver/sat-solver_core.patch | 127 -----
.../sat-solver/sat-solver_obsolete.patch | 22 -
.../sat-solver/sat-solver/sat-solver_rpm5.patch | 69 ---
meta/recipes-extended/sat-solver/sat-solver_git.bb | 67 ---
meta/recipes-extended/zypper/zypper/cmake.patch | 22 -
.../zypper/zypper/cmake_libxml2.patch | 28 --
.../zypper/dso_linking_change_build_fix.patch | 60 ---
.../recipes-extended/zypper/zypper/gcc-scope.patch | 20 -
.../recipes-extended/zypper/zypper/rpm5-flag.patch | 18 -
meta/recipes-extended/zypper/zypper/rpmatch.patch | 23 -
meta/recipes-extended/zypper/zypper_git.bb | 29 --
meta/recipes-support/libcheck/libcheck_0.9.9.bb | 2 +-
32 files changed, 1 insertion(+), 1831 deletions(-)
delete mode 100644 meta/recipes-extended/libzypp/libzypp/arm-workaround-global-constructor.patch
delete mode 100644 meta/recipes-extended/libzypp/libzypp/close.patch
delete mode 100644 meta/recipes-extended/libzypp/libzypp/config-release.patch
delete mode 100644 meta/recipes-extended/libzypp/libzypp/cstdio.patch
delete mode 100644 meta/recipes-extended/libzypp/libzypp/fix_for_compile_wth_gcc-4.6.0.patch
delete mode 100644 meta/recipes-extended/libzypp/libzypp/hardcode-lib-fix.patch
delete mode 100644 meta/recipes-extended/libzypp/libzypp/libzypp-compatargs.patch
delete mode 100644 meta/recipes-extended/libzypp/libzypp/libzypp-oearch.patch
delete mode 100644 meta/recipes-extended/libzypp/libzypp/libzypp-rpm549.patch
delete mode 100644 meta/recipes-extended/libzypp/libzypp/mips-workaround-gcc-tribool-error.patch
delete mode 100644 meta/recipes-extended/libzypp/libzypp/no-doc.patch
delete mode 100644 meta/recipes-extended/libzypp/libzypp/rpm5-no-rpmdbinit.patch
delete mode 100644 meta/recipes-extended/libzypp/libzypp/rpm5.patch
delete mode 100644 meta/recipes-extended/libzypp/libzypp_git.bb
delete mode 100644 meta/recipes-extended/sat-solver/sat-solver/0001-sat_xfopen.c-Forward-port-to-zlib-1.2.6-gzFile.patch
delete mode 100644 meta/recipes-extended/sat-solver/sat-solver/cmake.patch
delete mode 100644 meta/recipes-extended/sat-solver/sat-solver/db5.patch
delete mode 100644 meta/recipes-extended/sat-solver/sat-solver/fix_gcc-4.6.0_compile_issue.patch
delete mode 100644 meta/recipes-extended/sat-solver/sat-solver/futimes.patch
delete mode 100644 meta/recipes-extended/sat-solver/sat-solver/sat-solver_core.patch
delete mode 100644 meta/recipes-extended/sat-solver/sat-solver/sat-solver_obsolete.patch
delete mode 100644 meta/recipes-extended/sat-solver/sat-solver/sat-solver_rpm5.patch
delete mode 100644 meta/recipes-extended/sat-solver/sat-solver_git.bb
delete mode 100644 meta/recipes-extended/zypper/zypper/cmake.patch
delete mode 100644 meta/recipes-extended/zypper/zypper/cmake_libxml2.patch
delete mode 100644 meta/recipes-extended/zypper/zypper/dso_linking_change_build_fix.patch
delete mode 100644 meta/recipes-extended/zypper/zypper/gcc-scope.patch
delete mode 100644 meta/recipes-extended/zypper/zypper/rpm5-flag.patch
delete mode 100644 meta/recipes-extended/zypper/zypper/rpmatch.patch
delete mode 100644 meta/recipes-extended/zypper/zypper_git.bb
--
1.7.10.4
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 1/5] zypper: remove
2013-01-23 12:10 [PATCH 0/5] Zypper removal Paul Eggleton
@ 2013-01-23 12:10 ` Paul Eggleton
2013-01-23 12:10 ` [PATCH 2/5] libzypp: remove Paul Eggleton
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Paul Eggleton @ 2013-01-23 12:10 UTC (permalink / raw)
To: openembedded-core
Functionality provided by Zypper is now covered more effectively by
Smart (python-smartpm) which is now being used for package management
on the target when enabled and RPM packaging is selected.
Fixes [YOCTO #3349].
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
meta/recipes-extended/zypper/zypper/cmake.patch | 22 -------
.../zypper/zypper/cmake_libxml2.patch | 28 ---------
.../zypper/dso_linking_change_build_fix.patch | 60 --------------------
.../recipes-extended/zypper/zypper/gcc-scope.patch | 20 -------
.../recipes-extended/zypper/zypper/rpm5-flag.patch | 18 ------
meta/recipes-extended/zypper/zypper/rpmatch.patch | 23 --------
meta/recipes-extended/zypper/zypper_git.bb | 29 ----------
7 files changed, 200 deletions(-)
delete mode 100644 meta/recipes-extended/zypper/zypper/cmake.patch
delete mode 100644 meta/recipes-extended/zypper/zypper/cmake_libxml2.patch
delete mode 100644 meta/recipes-extended/zypper/zypper/dso_linking_change_build_fix.patch
delete mode 100644 meta/recipes-extended/zypper/zypper/gcc-scope.patch
delete mode 100644 meta/recipes-extended/zypper/zypper/rpm5-flag.patch
delete mode 100644 meta/recipes-extended/zypper/zypper/rpmatch.patch
delete mode 100644 meta/recipes-extended/zypper/zypper_git.bb
diff --git a/meta/recipes-extended/zypper/zypper/cmake.patch b/meta/recipes-extended/zypper/zypper/cmake.patch
deleted file mode 100644
index 8312a97..0000000
--- a/meta/recipes-extended/zypper/zypper/cmake.patch
+++ /dev/null
@@ -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 <qing.he@intel.com>
-
-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})
diff --git a/meta/recipes-extended/zypper/zypper/cmake_libxml2.patch b/meta/recipes-extended/zypper/zypper/cmake_libxml2.patch
deleted file mode 100644
index 8cda7a4..0000000
--- a/meta/recipes-extended/zypper/zypper/cmake_libxml2.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Upstream-Status: Pending
-
-Signed-off-by: Saul Wold <sgw@linux.intel.com>
-
-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(
diff --git a/meta/recipes-extended/zypper/zypper/dso_linking_change_build_fix.patch b/meta/recipes-extended/zypper/zypper/dso_linking_change_build_fix.patch
deleted file mode 100644
index 085762d..0000000
--- a/meta/recipes-extended/zypper/zypper/dso_linking_change_build_fix.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-Upstream-Status: Pending
-
-after gcc linking has changed, all the libraries must be explicitely specified
-This patch avoids these linking errors:
-
-| Linking CXX executable zypp-refresh
-| cd /build_disk/poky_build/build0/tmp/work/i586-poky-linux/zypper-1.4.7-git0+9eb0e248e06c8d20ad054be2439149d9ede37531-r2/git/src && /build_disk/poky_build/build0/tmp/sysroots/x86_64-linux/usr/bin/cmake -E cmake_link_script CMakeFiles/zypp-refresh.dir/link.txt --verbose=1
-| /build_disk/poky_build/build0/tmp/sysroots/x86_64-linux/usr/bin/i586-poky-linux/i586-poky-linux-g++ -march=i586 --sysroot=/build_disk/poky_build/build0/tmp/sysroots/i586-poky-linux -fpermissive -g -O2 -Wall -Woverloaded-virtual -fstack-protector -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed CMakeFiles/zypp-refresh.dir/zypp-refresh.cc.o -o zypp-refresh -rdynamic -lzypp
-| /build_disk/poky_build/build0/tmp/sysroots/x86_64-linux/usr/libexec/i586-poky-linux/gcc/i586-poky-linux/4.5.1/ld: �: invalid DSO for symbol `pthread_cancel@@GLIBC_2.0' definition
-| /build_disk/poky_build/build0/tmp/sysroots/i586-poky-linux/lib/libpthread.so.0: could not read symbols: Bad value
-| collect2: ld returned 1 exit status
-| make[2]: *** [src/zypp-refresh] Error 1
-| make[2]: Leaving directory `/build_disk/poky_build/build0/tmp/work/i586-poky-linux/zypper-1.4.7-git0+9eb0e248e06c8d20ad054be2439149d9ede37531-r2/git'
-| make[1]: *** [src/CMakeFiles/zypp-refresh.dir/all] Error 2
-
-
-| Linking CXX executable zypper
-| cd /build_disk/poky_build/build0/tmp/work/i586-poky-linux/zypper-1.4.7-git0+9eb0e248e06c8d20ad054be2439149d9ede37531-r3/git/src && /build_disk/poky_build/build0/tmp/sysroots/x86_64-linux/usr/bin/cmake -E cmake_link_script CMakeFiles/zypper.dir/link.txt --verbose=1
-| /build_disk/poky_build/build0/tmp/sysroots/x86_64-linux/usr/bin/i586-poky-linux/i586-poky-linux-g++ -march=i586 --sysroot=/build_disk/poky_build/build0/tmp/sysroots/i586-poky-linux -fpermissive -g -O2 -Wall -Woverloaded-virtual -fstack-protector -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed CMakeFiles/zypper.dir/main.cc.o -o zypper -rdynamic libzypper_lib.a -lzypp -lreadline -laugeas -laugeas
-| /build_disk/poky_build/build0/tmp/sysroots/x86_64-linux/usr/libexec/i586-poky-linux/gcc/i586-poky-linux/4.5.1/ld: �: invalid DSO for symbol `pthread_cancel@@GLIBC_2.0' definition
-| /build_disk/poky_build/build0/tmp/sysroots/i586-poky-linux/lib/libpthread.so.0: could not read symbols: Bad value
-| collect2: ld returned 1 exit status
-| make[2]: *** [src/zypper] Error 1
-
-
-| Linking CXX executable zypper
-| cd /build_disk/poky_build/build0/tmp/work/i586-poky-linux/zypper-1.4.7-git0+9eb0e248e06c8d20ad054be2439149d9ede37531-r3/git/src && /build_disk/poky_build/build0/tmp/sysroots/x86_64-linux/usr/bin/cmake -E cmake_link_script CMakeFiles/zypper.dir/link.txt --verbose=1
-| /build_disk/poky_build/build0/tmp/sysroots/x86_64-linux/usr/bin/i586-poky-linux/i586-poky-linux-g++ -march=i586 --sysroot=/build_disk/poky_build/build0/tmp/sysroots/i586-poky-linux -fpermissive -g -O2 -Wall -Woverloaded-virtual -fstack-protector -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed CMakeFiles/zypper.dir/main.cc.o -o zypper -rdynamic libzypper_lib.a -lzypp -lreadline -laugeas -laugeas -lpthread
-| /build_disk/poky_build/build0/tmp/sysroots/x86_64-linux/usr/libexec/i586-poky-linux/gcc/i586-poky-linux/4.5.1/ld: �: invalid DSO for symbol `clock_gettime@@GLIBC_2.2' definition
-| /build_disk/poky_build/build0/tmp/sysroots/i586-poky-linux/lib/librt.so.1: could not read symbols: Bad value
-| collect2: ld returned 1 exit status
-| make[2]: *** [src/zypper] Error 1
-
-
-Nitin A Kamble <nitin.a.kamble@intel.com>
-Date: 2011/01/19
-
-
-Index: git/src/CMakeLists.txt
-===================================================================
---- git.orig/src/CMakeLists.txt 2010-12-20 00:02:02.000000000 -0800
-+++ git/src/CMakeLists.txt 2011-01-19 09:23:13.432758255 -0800
-@@ -93,7 +93,7 @@
- TARGET_LINK_LIBRARIES( zypper_lib ${ZYPP_LIBRARY} ${READLINE_LIBRARY} -laugeas ${AUGEAS_LIBRARY} )
-
- ADD_EXECUTABLE( zypper main.cc )
--TARGET_LINK_LIBRARIES( zypper zypper_lib ${ZYPP_LIBRARY} ${READLINE_LIBRARY} -laugeas ${AUGEAS_LIBRARY} -lrt )
-+TARGET_LINK_LIBRARIES( zypper zypper_lib ${ZYPP_LIBRARY} ${READLINE_LIBRARY} -laugeas ${AUGEAS_LIBRARY} -lrt -lpthread )
-
-
- INSTALL(
-@@ -115,7 +115,7 @@
-
- # zypp-refresh utility
- ADD_EXECUTABLE( zypp-refresh zypp-refresh.cc )
--TARGET_LINK_LIBRARIES( zypp-refresh ${ZYPP_LIBRARY} )
-+TARGET_LINK_LIBRARIES( zypp-refresh ${ZYPP_LIBRARY} -lpthread )
- INSTALL(
- TARGETS zypp-refresh
- RUNTIME DESTINATION ${INSTALL_PREFIX}/sbin
diff --git a/meta/recipes-extended/zypper/zypper/gcc-scope.patch b/meta/recipes-extended/zypper/zypper/gcc-scope.patch
deleted file mode 100644
index a35c0d9..0000000
--- a/meta/recipes-extended/zypper/zypper/gcc-scope.patch
+++ /dev/null
@@ -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 <raj.khem@gmail.com>
-
-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;
-
diff --git a/meta/recipes-extended/zypper/zypper/rpm5-flag.patch b/meta/recipes-extended/zypper/zypper/rpm5-flag.patch
deleted file mode 100644
index 89564a6..0000000
--- a/meta/recipes-extended/zypper/zypper/rpm5-flag.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
-It's required by libzypp headers
-
-Signed-off-by: Qing He <qing.he@intel.com>
-
-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" )
diff --git a/meta/recipes-extended/zypper/zypper/rpmatch.patch b/meta/recipes-extended/zypper/zypper/rpmatch.patch
deleted file mode 100644
index a750a3b..0000000
--- a/meta/recipes-extended/zypper/zypper/rpmatch.patch
+++ /dev/null
@@ -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 <raj.khem@gmail.com>
-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_*/
diff --git a/meta/recipes-extended/zypper/zypper_git.bb b/meta/recipes-extended/zypper/zypper_git.bb
deleted file mode 100644
index c5d7c61..0000000
--- a/meta/recipes-extended/zypper/zypper_git.bb
+++ /dev/null
@@ -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"
--
1.7.10.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/5] libzypp: remove
2013-01-23 12:10 [PATCH 0/5] Zypper removal Paul Eggleton
2013-01-23 12:10 ` [PATCH 1/5] zypper: remove Paul Eggleton
@ 2013-01-23 12:10 ` Paul Eggleton
2013-01-23 12:10 ` [PATCH 3/5] sat-solver: remove Paul Eggleton
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Paul Eggleton @ 2013-01-23 12:10 UTC (permalink / raw)
To: openembedded-core
This was only needed by zypper, which has itself been removed.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
.../arm-workaround-global-constructor.patch | 71 ---
meta/recipes-extended/libzypp/libzypp/close.patch | 32 --
.../libzypp/libzypp/config-release.patch | 23 -
meta/recipes-extended/libzypp/libzypp/cstdio.patch | 49 --
.../libzypp/fix_for_compile_wth_gcc-4.6.0.patch | 22 -
.../libzypp/libzypp/hardcode-lib-fix.patch | 22 -
.../libzypp/libzypp/libzypp-compatargs.patch | 54 ---
.../libzypp/libzypp/libzypp-oearch.patch | 500 --------------------
.../libzypp/libzypp/libzypp-rpm549.patch | 32 --
.../mips-workaround-gcc-tribool-error.patch | 24 -
meta/recipes-extended/libzypp/libzypp/no-doc.patch | 33 --
.../libzypp/libzypp/rpm5-no-rpmdbinit.patch | 27 --
meta/recipes-extended/libzypp/libzypp/rpm5.patch | 32 --
meta/recipes-extended/libzypp/libzypp_git.bb | 160 -------
14 files changed, 1081 deletions(-)
delete mode 100644 meta/recipes-extended/libzypp/libzypp/arm-workaround-global-constructor.patch
delete mode 100644 meta/recipes-extended/libzypp/libzypp/close.patch
delete mode 100644 meta/recipes-extended/libzypp/libzypp/config-release.patch
delete mode 100644 meta/recipes-extended/libzypp/libzypp/cstdio.patch
delete mode 100644 meta/recipes-extended/libzypp/libzypp/fix_for_compile_wth_gcc-4.6.0.patch
delete mode 100644 meta/recipes-extended/libzypp/libzypp/hardcode-lib-fix.patch
delete mode 100644 meta/recipes-extended/libzypp/libzypp/libzypp-compatargs.patch
delete mode 100644 meta/recipes-extended/libzypp/libzypp/libzypp-oearch.patch
delete mode 100644 meta/recipes-extended/libzypp/libzypp/libzypp-rpm549.patch
delete mode 100644 meta/recipes-extended/libzypp/libzypp/mips-workaround-gcc-tribool-error.patch
delete mode 100644 meta/recipes-extended/libzypp/libzypp/no-doc.patch
delete mode 100644 meta/recipes-extended/libzypp/libzypp/rpm5-no-rpmdbinit.patch
delete mode 100644 meta/recipes-extended/libzypp/libzypp/rpm5.patch
delete mode 100644 meta/recipes-extended/libzypp/libzypp_git.bb
diff --git a/meta/recipes-extended/libzypp/libzypp/arm-workaround-global-constructor.patch b/meta/recipes-extended/libzypp/libzypp/arm-workaround-global-constructor.patch
deleted file mode 100644
index bfdb29b..0000000
--- a/meta/recipes-extended/libzypp/libzypp/arm-workaround-global-constructor.patch
+++ /dev/null
@@ -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 <mark.hatle@windriver.com>
-
-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 )
diff --git a/meta/recipes-extended/libzypp/libzypp/close.patch b/meta/recipes-extended/libzypp/libzypp/close.patch
deleted file mode 100644
index 0ff1825..0000000
--- a/meta/recipes-extended/libzypp/libzypp/close.patch
+++ /dev/null
@@ -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 <raj.khem@gmail.com>
-
-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;
diff --git a/meta/recipes-extended/libzypp/libzypp/config-release.patch b/meta/recipes-extended/libzypp/libzypp/config-release.patch
deleted file mode 100644
index 26c7307..0000000
--- a/meta/recipes-extended/libzypp/libzypp/config-release.patch
+++ /dev/null
@@ -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 <mark.hatle@windriver.com>
-
-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"; }
-
- ///////////////////////////////////////////////////////////////////
-
diff --git a/meta/recipes-extended/libzypp/libzypp/cstdio.patch b/meta/recipes-extended/libzypp/libzypp/cstdio.patch
deleted file mode 100644
index a021d58..0000000
--- a/meta/recipes-extended/libzypp/libzypp/cstdio.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-include cstdio to get definitions of ::xxx functions which
-are now reported by gcc-4.7 as wanrings and warnings are treated
-as errors
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-Upstream-Status: Pending
-
-Index: git/zypp/ExternalProgram.cc
-===================================================================
---- git.orig/zypp/ExternalProgram.cc 2012-06-01 16:25:17.098304709 -0700
-+++ git/zypp/ExternalProgram.cc 2012-06-01 16:25:37.254305681 -0700
-@@ -22,6 +22,7 @@
- #include <cstring> // strsignal
- #include <iostream>
- #include <sstream>
-+#include <cstdio>
-
- #include "zypp/base/Logger.h"
- #include "zypp/base/String.h"
-Index: git/zypp/PluginScript.cc
-===================================================================
---- git.orig/zypp/PluginScript.cc 2012-06-01 16:21:37.814294089 -0700
-+++ git/zypp/PluginScript.cc 2012-06-01 16:24:41.002302961 -0700
-@@ -14,6 +14,7 @@
-
- #include <iostream>
- #include <sstream>
-+#include <cstdio>
-
- #include "zypp/base/LogTools.h"
- #include "zypp/base/DefaultIntegral.h"
-@@ -336,7 +337,7 @@
- if ( fd == -1 )
- ZYPP_THROW( PluginScriptException( "Bad file descriptor" ) );
-
-- ::clearerr( filep );
-+ std::clearerr( filep );
- std::string data;
- {
- PluginDebugBuffer _debug( data ); // dump receive buffer if PLUGIN_DEBUG
-@@ -370,7 +371,7 @@
- int retval = select( fd+1, &rfds, NULL, NULL, &tv );
- if ( retval > 0 ) // FD_ISSET( fd, &rfds ) will be true.
- {
-- ::clearerr( filep );
-+ std::clearerr( filep );
- }
- else if ( retval == 0 )
- {
diff --git a/meta/recipes-extended/libzypp/libzypp/fix_for_compile_wth_gcc-4.6.0.patch b/meta/recipes-extended/libzypp/libzypp/fix_for_compile_wth_gcc-4.6.0.patch
deleted file mode 100644
index 0f17b48..0000000
--- a/meta/recipes-extended/libzypp/libzypp/fix_for_compile_wth_gcc-4.6.0.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Upstream-Status: Pending
-
-Fix following compilation errors with gcc 4.6.0
-Nitin A Kamble <nitin.a.kamble@intel.com> 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)
diff --git a/meta/recipes-extended/libzypp/libzypp/hardcode-lib-fix.patch b/meta/recipes-extended/libzypp/libzypp/hardcode-lib-fix.patch
deleted file mode 100644
index c11f5c5..0000000
--- a/meta/recipes-extended/libzypp/libzypp/hardcode-lib-fix.patch
+++ /dev/null
@@ -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 <ke.yu@intel.com>
-
-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" )
-
- ## ############################################################
-
diff --git a/meta/recipes-extended/libzypp/libzypp/libzypp-compatargs.patch b/meta/recipes-extended/libzypp/libzypp/libzypp-compatargs.patch
deleted file mode 100644
index 8d24ab0..0000000
--- a/meta/recipes-extended/libzypp/libzypp/libzypp-compatargs.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-zypp/Arch.cc: Add room for additional architecture compatibilities
-
-Upstream-Status: Pending
-
-Increase the size of the compatibility table from 9 to 30. There are already
-existing checks within libzypp to ensure that we don't overflow the 64-bit
-architecture field, so nothing further was required.
-
-Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
-
-diff -ur git.orig/zypp/Arch.cc git/zypp/Arch.cc
---- git.orig/zypp/Arch.cc 2011-08-02 16:40:37.696662889 -0500
-+++ git/zypp/Arch.cc 2011-08-04 11:24:18.051745246 -0500
-@@ -280,13 +280,39 @@
- IdString arch6_r = IdString(),
- IdString arch7_r = IdString(),
- IdString arch8_r = IdString(),
-- IdString arch9_r = IdString() )
-+ IdString arch9_r = IdString(),
-+ IdString arch10_r = IdString(),
-+ IdString arch11_r = IdString(),
-+ IdString arch12_r = IdString(),
-+ IdString arch13_r = IdString(),
-+ IdString arch14_r = IdString(),
-+ IdString arch15_r = IdString(),
-+ IdString arch16_r = IdString(),
-+ IdString arch17_r = IdString(),
-+ IdString arch18_r = IdString(),
-+ IdString arch19_r = IdString(),
-+ IdString arch20_r = IdString(),
-+ IdString arch21_r = IdString(),
-+ IdString arch22_r = IdString(),
-+ IdString arch23_r = IdString(),
-+ IdString arch24_r = IdString(),
-+ IdString arch25_r = IdString(),
-+ IdString arch26_r = IdString(),
-+ IdString arch27_r = IdString(),
-+ IdString arch28_r = IdString(),
-+ IdString arch29_r = IdString(),
-+ IdString arch30_r = IdString() )
- {
- const CompatEntry & target( assertCompatSetEntry( targetArch_r ) );
- target.addCompatBit( assertCompatSetEntry( arch0_r )._idBit );
- #define _SETARG(N) if ( arch##N##_r.empty() ) return; target.addCompatBit( assertCompatSetEntry( arch##N##_r )._idBit )
- _SETARG(1); _SETARG(2); _SETARG(3); _SETARG(4);
- _SETARG(5); _SETARG(6); _SETARG(7); _SETARG(8); _SETARG(9);
-+ _SETARG(10); _SETARG(11); _SETARG(12); _SETARG(13); _SETARG(14);
-+ _SETARG(15); _SETARG(16); _SETARG(17); _SETARG(18); _SETARG(19);
-+ _SETARG(20); _SETARG(21); _SETARG(22); _SETARG(23); _SETARG(24);
-+ _SETARG(25); _SETARG(26); _SETARG(27); _SETARG(28); _SETARG(29);
-+ _SETARG(30);
- #undef _SETARG
- }
-
diff --git a/meta/recipes-extended/libzypp/libzypp/libzypp-oearch.patch b/meta/recipes-extended/libzypp/libzypp/libzypp-oearch.patch
deleted file mode 100644
index 9a0e42b..0000000
--- a/meta/recipes-extended/libzypp/libzypp/libzypp-oearch.patch
+++ /dev/null
@@ -1,500 +0,0 @@
-Upstream-Status: Inappropriate [distribution]
-
-Disable all of the internal architectures
-
-We disable all of the internal architectures and replace them with ones
-generated by the libzypp recipe as specified in the oe-arch.h.
-
-Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
-
-diff -ur git.orig/tests/lib/TestSetup.h git/tests/lib/TestSetup.h
---- git.orig/tests/lib/TestSetup.h 2011-03-28 14:24:36.534800770 -0500
-+++ git/tests/lib/TestSetup.h 2011-03-28 14:25:04.969912234 -0500
-@@ -66,7 +66,7 @@
- * // enabls loging fot the scope of this block:
- * // base::LogControl::TmpLineWriter shutUp( new log::FileLineWriter( "/tmp/YLOG" ) );
- *
-- * TestSetup test( Arch_x86_64 );
-+ * TestSetup test( Arch_machine );
- * // test.loadTarget(); // initialize and load target
- * test.loadRepo( TESTS_SRC_DIR"/data/openSUSE-11.1" );
- *
-@@ -313,7 +313,7 @@
- * a TestSetup system or a real system. The provided repostitories are
- * loaded into the pool (without refresh).
- */
-- static void LoadSystemAt( const Pathname & sysRoot, const Arch & _testSetupArch_r = Arch_x86_64 )
-+ static void LoadSystemAt( const Pathname & sysRoot, const Arch & _testSetupArch_r = Arch_machine )
- {
- if ( ! PathInfo( sysRoot ).isDir() )
- ZYPP_THROW( Exception("sysRoot argument needs to be a directory") );
-diff -ur git.orig/tools/DumpSelectable.cc git/tools/DumpSelectable.cc
---- git.orig/tools/DumpSelectable.cc 2011-03-28 14:24:36.547876951 -0500
-+++ git/tools/DumpSelectable.cc 2011-03-28 14:25:04.969912234 -0500
-@@ -78,7 +78,7 @@
- else if ( TestSetup::isTestSetup( sysRoot ) )
- {
- message << str::form( "*** Load TestSetup from '%s'", sysRoot.c_str() ) << endl;
-- TestSetup test( sysRoot, Arch_x86_64 );
-+ TestSetup test( sysRoot, Arch_machine );
- test.loadRepos();
- }
- else
-diff -ur git.orig/tools/NameReqPrv.cc git/tools/NameReqPrv.cc
---- git.orig/tools/NameReqPrv.cc 2011-03-28 14:24:36.547876951 -0500
-+++ git/tools/NameReqPrv.cc 2011-03-28 14:25:04.970849384 -0500
-@@ -112,7 +112,7 @@
- else if ( TestSetup::isTestSetup( sysRoot ) )
- {
- message << str::form( "*** Load TestSetup from '%s'", sysRoot.c_str() ) << endl;
-- TestSetup test( sysRoot, Arch_x86_64 );
-+ TestSetup test( sysRoot, Arch_machine );
- test.loadRepos();
- dumpRange( message, satpool.reposBegin(), satpool.reposEnd() ) << endl;
- }
-diff -ur git.orig/tools/ToolScanRepos.cc git/tools/ToolScanRepos.cc
---- git.orig/tools/ToolScanRepos.cc 2011-03-28 14:24:36.547876951 -0500
-+++ git/tools/ToolScanRepos.cc 2011-03-28 14:25:04.970849384 -0500
-@@ -46,7 +46,7 @@
- ///////////////////////////////////////////////////////////////////
- Pathname mtmp( "/tmp" );
- Pathname mroot( mtmp/appname );
-- Arch march( Arch_x86_64 );
-+ Arch march( Arch_machine );
- bool oClearRoot = true;
-
- std::vector<std::string> urls;
-@@ -83,7 +83,7 @@
- if ( *(argv[0]) ) // empty
- march = Arch( argv[0] );
- else
-- march = Arch_x86_64;
-+ march = Arch_machine;
- }
- else
- {
-@@ -131,4 +131,4 @@
-
- INT << "===[END]============================================" << endl << endl;
- return ret;
--}
-\ No newline at end of file
-+}
-diff -ur git.orig/tools/zypp-list.cc git/tools/zypp-list.cc
---- git.orig/tools/zypp-list.cc 2011-03-28 14:24:36.547876951 -0500
-+++ git/tools/zypp-list.cc 2011-03-28 14:25:04.971901224 -0500
-@@ -56,7 +56,7 @@
- else if ( TestSetup::isTestSetup( sysRoot ) )
- {
- message << str::form( "*** Load TestSetup from '%s'", sysRoot.c_str() ) << endl;
-- TestSetup test( sysRoot, Arch_x86_64 );
-+ TestSetup test( sysRoot, Arch_machine );
- test.loadRepos();
- dumpRange( message, satpool.reposBegin(), satpool.reposEnd() ) << endl;
- }
-diff -ur git.orig/zypp/Arch.cc git/zypp/Arch.cc
---- git.orig/zypp/Arch.cc 2011-03-28 14:24:36.548877414 -0500
-+++ git/zypp/Arch.cc 2011-03-28 14:31:13.943786442 -0500
-@@ -153,53 +153,11 @@
- // bit for each architecture.
- //
- #define DEF_BUILTIN(A) const IdString _##A( #A );
-+ DEF_BUILTIN( all );
-+ DEF_BUILTIN( any );
- DEF_BUILTIN( noarch );
-
-- DEF_BUILTIN( i386 );
-- DEF_BUILTIN( i486 );
-- DEF_BUILTIN( i586 );
-- DEF_BUILTIN( i686 );
-- DEF_BUILTIN( athlon );
-- DEF_BUILTIN( x86_64 );
--
-- DEF_BUILTIN( pentium3 );
-- DEF_BUILTIN( pentium4 );
--
-- DEF_BUILTIN( s390 );
-- DEF_BUILTIN( s390x );
--
-- DEF_BUILTIN( ppc );
-- DEF_BUILTIN( ppc64 );
--
-- DEF_BUILTIN( ia64 );
--
-- DEF_BUILTIN( alphaev67 );
-- DEF_BUILTIN( alphaev6 );
-- DEF_BUILTIN( alphapca56 );
-- DEF_BUILTIN( alphaev56 );
-- DEF_BUILTIN( alphaev5 );
-- DEF_BUILTIN( alpha );
--
-- DEF_BUILTIN( sparc64v );
-- DEF_BUILTIN( sparcv9v );
-- DEF_BUILTIN( sparc64 );
-- DEF_BUILTIN( sparcv9 );
-- DEF_BUILTIN( sparcv8 );
-- DEF_BUILTIN( sparc );
--
-- DEF_BUILTIN( armv7l );
-- DEF_BUILTIN( armv6l );
-- DEF_BUILTIN( armv5tejl );
-- DEF_BUILTIN( armv5tel );
-- DEF_BUILTIN( armv5l );
-- DEF_BUILTIN( armv4tl );
-- DEF_BUILTIN( armv4l );
-- DEF_BUILTIN( armv3l );
--
-- DEF_BUILTIN( sh3 );
--
-- DEF_BUILTIN( sh4 );
-- DEF_BUILTIN( sh4a );
-+#include "oe-arch.h"
- #undef DEF_BUILTIN
-
- ///////////////////////////////////////////////////////////////////
-@@ -269,6 +227,8 @@
- // _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 ) );
- ///////////////////////////////////////////////////////////////////
- // Define the CompatibleWith relation:
-@@ -276,52 +236,9 @@
- // NOTE: Order of definition is significant! (Arch::compare)
- // - define compatible (less) architectures first!
- //
-- defCompatibleWith( _i386, _noarch );
-- defCompatibleWith( _i486, _noarch,_i386 );
-- defCompatibleWith( _i586, _noarch,_i386,_i486 );
-- defCompatibleWith( _i686, _noarch,_i386,_i486,_i586 );
-- defCompatibleWith( _athlon, _noarch,_i386,_i486,_i586,_i686 );
-- defCompatibleWith( _x86_64, _noarch,_i386,_i486,_i586,_i686,_athlon );
--
-- defCompatibleWith( _pentium3, _noarch,_i386,_i486,_i586,_i686 );
-- defCompatibleWith( _pentium4, _noarch,_i386,_i486,_i586,_i686,_pentium3 );
--
-- defCompatibleWith( _ia64, _noarch,_i386,_i486,_i586,_i686 );
-- //
-- defCompatibleWith( _s390, _noarch );
-- defCompatibleWith( _s390x, _noarch,_s390 );
-- //
-- defCompatibleWith( _ppc, _noarch );
-- defCompatibleWith( _ppc64, _noarch,_ppc );
-- //
-- defCompatibleWith( _alpha, _noarch );
-- defCompatibleWith( _alphaev5, _noarch,_alpha );
-- defCompatibleWith( _alphaev56, _noarch,_alpha,_alphaev5 );
-- defCompatibleWith( _alphapca56, _noarch,_alpha,_alphaev5,_alphaev56 );
-- defCompatibleWith( _alphaev6, _noarch,_alpha,_alphaev5,_alphaev56,_alphapca56 );
-- defCompatibleWith( _alphaev67, _noarch,_alpha,_alphaev5,_alphaev56,_alphapca56,_alphaev6 );
-- //
-- defCompatibleWith( _sparc, _noarch );
-- defCompatibleWith( _sparcv8, _noarch,_sparc );
-- defCompatibleWith( _sparcv9, _noarch,_sparc,_sparcv8 );
-- defCompatibleWith( _sparcv9v, _noarch,_sparc,_sparcv8,_sparcv9 );
-- //
-- defCompatibleWith( _sparc64, _noarch,_sparc,_sparcv8,_sparcv9 );
-- defCompatibleWith( _sparc64v, _noarch,_sparc,_sparcv8,_sparcv9,_sparcv9v,_sparc64 );
-- //
-- defCompatibleWith( _armv3l, _noarch );
-- defCompatibleWith( _armv4l, _noarch,_armv3l );
-- defCompatibleWith( _armv4tl, _noarch,_armv3l,_armv4l );
-- defCompatibleWith( _armv5l, _noarch,_armv3l,_armv4l,_armv4tl );
-- defCompatibleWith( _armv5tel, _noarch,_armv3l,_armv4l,_armv4tl,_armv5l );
-- defCompatibleWith( _armv5tejl, _noarch,_armv3l,_armv4l,_armv4tl,_armv5l,_armv5tel );
-- defCompatibleWith( _armv6l, _noarch,_armv3l,_armv4l,_armv4tl,_armv5l,_armv5tel,_armv5tejl );
-- defCompatibleWith( _armv7l, _noarch,_armv3l,_armv4l,_armv4tl,_armv5l,_armv5tel,_armv5tejl,_armv6l );
-- //
-- defCompatibleWith( _sh3, _noarch );
-- //
-- defCompatibleWith( _sh4, _noarch );
-- defCompatibleWith( _sh4a, _noarch,_sh4 );
-+#define OE_DEF_COMPAT 1
-+#include "oe-arch.h"
-+#undef OE_DEF_COMPAT
- //
- ///////////////////////////////////////////////////////////////////
- // dumpOn( USR ) << endl;
-@@ -388,53 +305,13 @@
- ///////////////////////////////////////////////////////////////////
-
- const Arch Arch_empty ( IdString::Empty );
-+ const Arch Arch_all( _all );
-+ const Arch Arch_any( _any );
- const Arch Arch_noarch( _noarch );
-
-- const Arch Arch_i386( _i386 );
-- const Arch Arch_i486( _i486 );
-- const Arch Arch_i586( _i586 );
-- const Arch Arch_i686( _i686 );
-- const Arch Arch_athlon( _athlon );
-- const Arch Arch_x86_64( _x86_64 );
--
-- const Arch Arch_pentium3( _pentium3 );
-- const Arch Arch_pentium4( _pentium4 );
--
-- const Arch Arch_s390( _s390 );
-- const Arch Arch_s390x( _s390x );
--
-- const Arch Arch_ppc( _ppc );
-- const Arch Arch_ppc64( _ppc64 );
--
-- const Arch Arch_ia64( _ia64 );
--
-- const Arch Arch_alphaev67( _alphaev67 );
-- const Arch Arch_alphaev6( _alphaev6 );
-- const Arch Arch_alphapca56( _alphapca56 );
-- const Arch Arch_alphaev56( _alphaev56 );
-- const Arch Arch_alphaev5( _alphaev5 );
-- const Arch Arch_alpha( _alpha );
--
-- const Arch Arch_sparc64v( _sparc64v );
-- const Arch Arch_sparc64( _sparc64 );
-- const Arch Arch_sparcv9v( _sparcv9v );
-- const Arch Arch_sparcv9( _sparcv9 );
-- const Arch Arch_sparcv8( _sparcv8 );
-- const Arch Arch_sparc( _sparc );
--
-- const Arch Arch_armv7l( _armv7l );
-- const Arch Arch_armv6l( _armv6l );
-- const Arch Arch_armv5tejl( _armv5tejl );
-- const Arch Arch_armv5tel( _armv5tel );
-- const Arch Arch_armv5l( _armv5l );
-- const Arch Arch_armv4tl( _armv4tl );
-- const Arch Arch_armv4l( _armv4l );
-- const Arch Arch_armv3l( _armv3l );
--
-- const Arch Arch_sh3( _sh3 );
--
-- const Arch Arch_sh4( _sh4 );
-- const Arch Arch_sh4a( _sh4a );
-+#define OE_PROTO 1
-+#include "oe-arch.h"
-+#undef OE_PROTO
-
- ///////////////////////////////////////////////////////////////////
- //
-@@ -504,26 +381,10 @@
- //
- Arch Arch::baseArch( ) const
- {
-- // check the multilib archs:
-- if (Arch_x86_64.compatibleWith(*this))
-- {
-- return Arch_x86_64;
-- }
-- if (Arch_sparc64v.compatibleWith(*this))
-- {
-- return Arch_sparc64v;
-- }
-- if (Arch_sparc64.compatibleWith(*this))
-- {
-- return Arch_sparc64;
-- }
-- if (Arch_ppc64.compatibleWith(*this))
-- {
-- return Arch_ppc64;
-- }
-- if (Arch_s390x.compatibleWith(*this))
-+ // Check the multilib arch:
-+ if (Arch_machine.compatibleWith(*this))
- {
-- return Arch_s390x;
-+ return Arch_machine;
- }
- // Here: no multilib; return arch before noarch
- CompatSet cset( compatSet( *this ) );
-diff -ur git.orig/zypp/Arch.h git/zypp/Arch.h
---- git.orig/zypp/Arch.h 2011-03-28 14:24:36.548877414 -0500
-+++ git/zypp/Arch.h 2011-03-28 14:25:04.972801208 -0500
-@@ -162,89 +162,13 @@
- extern const Arch Arch_empty;
-
- /** \relates Arch */
-+ extern const Arch Arch_all;
-+ extern const Arch Arch_any;
- extern const Arch Arch_noarch;
-
-- /** \relates Arch */
-- extern const Arch Arch_pentium4;
-- /** \relates Arch */
-- extern const Arch Arch_pentium3;
--
-- /** \relates Arch */
-- extern const Arch Arch_x86_64;
-- /** \relates Arch */
-- extern const Arch Arch_athlon;
-- /** \relates Arch */
-- extern const Arch Arch_i686;
-- /** \relates Arch */
-- extern const Arch Arch_i586;
-- /** \relates Arch */
-- extern const Arch Arch_i486;
-- /** \relates Arch */
-- extern const Arch Arch_i386;
--
-- /** \relates Arch */
-- extern const Arch Arch_s390x;
-- /** \relates Arch */
-- extern const Arch Arch_s390;
--
-- /** \relates Arch */
-- extern const Arch Arch_ppc64;
-- /** \relates Arch */
-- extern const Arch Arch_ppc;
--
-- /** \relates Arch */
-- extern const Arch Arch_ia64;
--
-- /** \relates Arch */
-- extern const Arch Arch_alphaev67;
-- /** \relates Arch */
-- extern const Arch Arch_alphaev6;
-- /** \relates Arch */
-- extern const Arch Arch_alphapca56;
-- /** \relates Arch */
-- extern const Arch Arch_alphaev56;
-- /** \relates Arch */
-- extern const Arch Arch_alphaev5;
-- /** \relates Arch */
-- extern const Arch Arch_alpha;
--
-- /** \relates Arch */
-- extern const Arch Arch_sparc64v;
-- /** \relates Arch */
-- extern const Arch Arch_sparc64;
-- /** \relates Arch */
-- extern const Arch Arch_sparcv9v;
-- /** \relates Arch */
-- extern const Arch Arch_sparcv9;
-- /** \relates Arch */
-- extern const Arch Arch_sparcv8;
-- /** \relates Arch */
-- extern const Arch Arch_sparc;
--
-- /** \relates Arch */
-- extern const Arch Arch_armv7l;
-- /** \relates Arch */
-- extern const Arch Arch_armv6l;
-- /** \relates Arch */
-- extern const Arch Arch_armv5tejl;
-- /** \relates Arch */
-- extern const Arch Arch_armv5tel;
-- /** \relates Arch */
-- extern const Arch Arch_armv5l;
-- /** \relates Arch */
-- extern const Arch Arch_armv4tl;
-- /** \relates Arch */
-- extern const Arch Arch_armv4l;
-- /** \relates Arch */
-- extern const Arch Arch_armv3l;
--
-- /** \relates Arch */
-- extern const Arch Arch_sh3;
--
-- /** \relates Arch */
-- extern const Arch Arch_sh4;
-- /** \relates Arch */
-- extern const Arch Arch_sh4a;
-+#define OE_EXTERN_PROTO 1
-+#include "oe-arch.h"
-+#undef OE_EXTERN_PROTO
- //@}
-
- ///////////////////////////////////////////////////////////////////
-diff -ur git.orig/zypp/CMakeLists.txt git/zypp/CMakeLists.txt
---- git.orig/zypp/CMakeLists.txt
-+++ git/zypp/CMakeLists.txt
-@@ -90,6 +90,7 @@ SET( zypp_EARLY_SRCS
-
- SET( zypp_HEADERS
- Arch.h
-+ oe-arch.h
- AutoDispose.h
- Bit.h
- ByteCount.h
-diff -ur git.orig/zypp/ZConfig.cc git/zypp/ZConfig.cc
---- git.orig/zypp/ZConfig.cc 2011-03-28 14:24:37.178989632 -0500
-+++ git/zypp/ZConfig.cc 2011-03-28 14:25:04.973971936 -0500
-@@ -48,77 +48,9 @@
- */
- Arch _autodetectSystemArchitecture()
- {
-- struct ::utsname buf;
-- if ( ::uname( &buf ) < 0 )
-- {
-- ERR << "Can't determine system architecture" << endl;
-- return Arch_noarch;
-- }
--
-- Arch architecture( buf.machine );
-- MIL << "Uname architecture is '" << buf.machine << "'" << endl;
-+ /* Define the default architecture, ignore uname! */
-+ Arch architecture( Arch_machine );
-
-- if ( architecture == Arch_i686 )
-- {
-- // some CPUs report i686 but dont implement cx8 and cmov
-- // check for both flags in /proc/cpuinfo and downgrade
-- // to i586 if either is missing (cf bug #18885)
-- std::ifstream cpuinfo( "/proc/cpuinfo" );
-- if ( cpuinfo )
-- {
-- for( iostr::EachLine in( cpuinfo ); in; in.next() )
-- {
-- if ( str::hasPrefix( *in, "flags" ) )
-- {
-- if ( in->find( "cx8" ) == std::string::npos
-- || in->find( "cmov" ) == std::string::npos )
-- {
-- architecture = Arch_i586;
-- WAR << "CPU lacks 'cx8' or 'cmov': architecture downgraded to '" << architecture << "'" << endl;
-- }
-- break;
-- }
-- }
-- }
-- else
-- {
-- ERR << "Cant open " << PathInfo("/proc/cpuinfo") << endl;
-- }
-- }
-- else if ( architecture == Arch_sparc || architecture == Arch_sparc64 )
-- {
-- // Check for sun4[vum] to get the real arch. (bug #566291)
-- std::ifstream cpuinfo( "/proc/cpuinfo" );
-- if ( cpuinfo )
-- {
-- for( iostr::EachLine in( cpuinfo ); in; in.next() )
-- {
-- if ( str::hasPrefix( *in, "type" ) )
-- {
-- if ( in->find( "sun4v" ) != std::string::npos )
-- {
-- architecture = ( architecture == Arch_sparc64 ? Arch_sparc64v : Arch_sparcv9v );
-- WAR << "CPU has 'sun4v': architecture upgraded to '" << architecture << "'" << endl;
-- }
-- else if ( in->find( "sun4u" ) != std::string::npos )
-- {
-- architecture = ( architecture == Arch_sparc64 ? Arch_sparc64 : Arch_sparcv9 );
-- WAR << "CPU has 'sun4u': architecture upgraded to '" << architecture << "'" << endl;
-- }
-- else if ( in->find( "sun4m" ) != std::string::npos )
-- {
-- architecture = Arch_sparcv8;
-- WAR << "CPU has 'sun4m': architecture upgraded to '" << architecture << "'" << endl;
-- }
-- break;
-- }
-- }
-- }
-- else
-- {
-- ERR << "Cant open " << PathInfo("/proc/cpuinfo") << endl;
-- }
-- }
- return architecture;
- }
-
diff --git a/meta/recipes-extended/libzypp/libzypp/libzypp-rpm549.patch b/meta/recipes-extended/libzypp/libzypp/libzypp-rpm549.patch
deleted file mode 100644
index 7244284..0000000
--- a/meta/recipes-extended/libzypp/libzypp/libzypp-rpm549.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-commit 6c47ad415246cc3a3edac2e1637106d330574c85
-Author: Mark Hatle <mark.hatle@windriver.com>
-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 <mark.hatle@windriver.com>
-
-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;
diff --git a/meta/recipes-extended/libzypp/libzypp/mips-workaround-gcc-tribool-error.patch b/meta/recipes-extended/libzypp/libzypp/mips-workaround-gcc-tribool-error.patch
deleted file mode 100644
index d01ef70..0000000
--- a/meta/recipes-extended/libzypp/libzypp/mips-workaround-gcc-tribool-error.patch
+++ /dev/null
@@ -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 <kevin.tian@intel.com>, 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;
diff --git a/meta/recipes-extended/libzypp/libzypp/no-doc.patch b/meta/recipes-extended/libzypp/libzypp/no-doc.patch
deleted file mode 100644
index c7e6e92..0000000
--- a/meta/recipes-extended/libzypp/libzypp/no-doc.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
-not building doc (doxygen based)
-
-8/19/2010 - created by Qing He <qing.he@intel.com>
-
-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 )
-
diff --git a/meta/recipes-extended/libzypp/libzypp/rpm5-no-rpmdbinit.patch b/meta/recipes-extended/libzypp/libzypp/rpm5-no-rpmdbinit.patch
deleted file mode 100644
index 7006203..0000000
--- a/meta/recipes-extended/libzypp/libzypp/rpm5-no-rpmdbinit.patch
+++ /dev/null
@@ -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 )
diff --git a/meta/recipes-extended/libzypp/libzypp/rpm5.patch b/meta/recipes-extended/libzypp/libzypp/rpm5.patch
deleted file mode 100644
index bf3da24..0000000
--- a/meta/recipes-extended/libzypp/libzypp/rpm5.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Upstream-Status: Pending
-
-build fix for rpm5
-
-8/19/2010 - created by Qing He <qing.he@intel.com>
-
-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
diff --git a/meta/recipes-extended/libzypp/libzypp_git.bb b/meta/recipes-extended/libzypp/libzypp_git.bb
deleted file mode 100644
index 1729c78..0000000
--- a/meta/recipes-extended/libzypp/libzypp_git.bb
+++ /dev/null
@@ -1,160 +0,0 @@
-HOMEPAGE = "http://en.opensuse.org/Portal:Libzypp"
-DESCRIPTION = "The ZYpp Linux Software management framework"
-
-LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=11fccc94d26293d78cb4996cb17e5fa7"
-
-inherit cmake gettext
-
-DEPENDS = "rpm boost curl libxml2 zlib sat-solver expat openssl udev libproxy"
-
-S = "${WORKDIR}/git"
-SRCREV = "15b6c52260bbc52b3d8e585e271b67e10cc7c433"
-PV = "0.0-git${SRCPV}"
-PR = "r23"
-
-SRC_URI = "git://github.com/openSUSE/libzypp.git;protocol=git \
- file://no-doc.patch \
- file://rpm5.patch \
- file://rpm5-no-rpmdbinit.patch \
- file://config-release.patch \
- file://libzypp-oearch.patch \
- file://libzypp-compatargs.patch \
- file://fix_for_compile_wth_gcc-4.6.0.patch \
- file://hardcode-lib-fix.patch \
- file://close.patch \
- file://libzypp-rpm549.patch \
- file://cstdio.patch \
- "
-
-SRC_URI_append_mips = " file://mips-workaround-gcc-tribool-error.patch"
-
-# ARM specific global constructor workaround
-SRC_URI_append_arm = " file://arm-workaround-global-constructor.patch"
-
-# rpmdb2solv from sat-solver is run from libzypp
-RDEPENDS_${PN} = "sat-solver rpm-libs gzip ${RDEPGNUPG}"
-
-RDEPGNUPG = "gnupg"
-RDEPGNUPG_libc-uclibc = ""
-
-PACKAGES =+ "${PN}-pkgmgt"
-
-FILES_${PN} += "${libdir}/zypp ${datadir}/zypp ${datadir}/icons"
-FILES_${PN}-dev += "${datadir}/cmake"
-
-FILES_${PN}-pkgmgt = "${bindir}/package-manager \
- ${bindir}/package-manager-su \
- ${datadir}/applications/package-manager.desktop \
- "
-
-EXTRA_OECMAKE += " -DLIB=${@os.path.basename('${libdir}')}"
-OECMAKE_CXX_LINK_FLAGS_libc-uclibc += "-pthread"
-
-LDFLAGS += "-lpthread"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-AVOID_CONSTRUCTOR = ""
-
-# Due to an ARM specific compiler issue
-AVOID_CONSTRUCTOR_arm = "true"
-
-# Due to a potential conflict with '_mips' being a define
-AVOID_CONSTRUCTOR_mips = "true"
-
-do_archgen () {
- # We need to dynamically generate our arch file based on the machine
- # configuration
- echo "/* Automatically generated by the libzypp recipes */" > zypp/oe-arch.h
- echo "/* Avoid Constructor: ${AVOID_CONSTRUCTOR} */" >> zypp/oe-arch.h
- echo "" >> zypp/oe-arch.h
- echo "#ifndef OE_ARCH_H" >> zypp/oe-arch.h
- echo "#define OE_ARCH_H 1" >> zypp/oe-arch.h
- echo "#define Arch_machine Arch_${MACHINE_ARCH}" | tr - _ >> zypp/oe-arch.h
- echo "#endif /* OE_ARCH_H */" >> zypp/oe-arch.h
- echo "" >> zypp/oe-arch.h
- if [ "${AVOID_CONSTRUCTOR}" != "true" ]; then
- echo "#ifdef DEF_BUILTIN" >> zypp/oe-arch.h
- echo "/* Specify builtin types */" >> zypp/oe-arch.h
- for each_arch in ${PACKAGE_ARCHS} ; do
- case "$each_arch" in
- all | any | noarch)
- continue;;
- esac
- echo " DEF_BUILTIN( ${each_arch} );" | tr - _ >> zypp/oe-arch.h
- done
- echo "#endif /* DEF_BUILTIN */" >> zypp/oe-arch.h
- echo "" >> zypp/oe-arch.h
- fi
- echo "#ifdef OE_EXTERN_PROTO" >> zypp/oe-arch.h
- echo "/* Specify extern prototypes */" >> zypp/oe-arch.h
- for each_arch in ${PACKAGE_ARCHS} ; do
- case "$each_arch" in
- all | any | noarch)
- continue;;
- esac
- echo " extern const Arch Arch_${each_arch};" | tr - _ >> zypp/oe-arch.h
- done
- echo "#endif /* OE_EXTERN_PROTO */" >> zypp/oe-arch.h
- echo "" >> zypp/oe-arch.h
- echo "#ifdef OE_PROTO" >> zypp/oe-arch.h
- echo "/* Specify prototypes */" >> zypp/oe-arch.h
- for each_arch in ${PACKAGE_ARCHS} ; do
- case "$each_arch" in
- all | any | noarch)
- continue;;
- esac
- if [ "${AVOID_CONSTRUCTOR}" != "true" ]; then
- printf " const Arch Arch_${each_arch} " | tr - _ >> zypp/oe-arch.h
- echo "(_${each_arch});" | tr - _ >> zypp/oe-arch.h
- else
- printf " const Arch Arch_${each_arch} " | tr - _ >> zypp/oe-arch.h
- echo "( IdString ( \"${each_arch}\" ) );" | tr - _ >> zypp/oe-arch.h
- fi
- done
- echo "#endif /* OE_PROTO */" >> zypp/oe-arch.h
- echo "" >> zypp/oe-arch.h
- echo "#ifdef OE_DEF_COMPAT" >> zypp/oe-arch.h
- echo "/* Specify compatibility information */" >> zypp/oe-arch.h
- INSTALL_PLATFORM_ARCHS=""
- for each_arch in ${PACKAGE_ARCHS} ; do
- INSTALL_PLATFORM_ARCHS="$each_arch $INSTALL_PLATFORM_ARCHS"
- done
-
- COMPAT_WITH=""
- set -- ${INSTALL_PLATFORM_ARCHS}
- while [ $# -gt 0 ]; do
- case "$1" in
- all | any | noarch)
- shift ; continue;;
- esac
- if [ "${AVOID_CONSTRUCTOR}" != "true" ]; then
- CARCH="_$1"
- else
- CARCH="IdString(\"$1\")"
- fi
- shift
- COMPAT=""
- for each_arch in "$@"; do
- if [ -z "${AVOID_CONSTRUCTOR}" ]; then
- arch_val="_${each_arch}"
- else
- arch_val="IdString(\"${each_arch}\")"
- fi
- if [ -z "$COMPAT" ]; then
- COMPAT=${arch_val}
- else
- COMPAT="${arch_val},$COMPAT"
- fi
- done
- COMPAT_WITH="${CARCH},${COMPAT} $COMPAT_WITH"
- done
- for each_compat in ${COMPAT_WITH} ; do
- echo " defCompatibleWith( ${each_compat} );" | tr - _ >> zypp/oe-arch.h
- done
- echo "#endif /* DEF_COMPAT */" >> zypp/oe-arch.h
- echo "" >> zypp/oe-arch.h
-}
-
-addtask archgen before do_configure after do_patch
--
1.7.10.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 3/5] sat-solver: remove
2013-01-23 12:10 [PATCH 0/5] Zypper removal Paul Eggleton
2013-01-23 12:10 ` [PATCH 1/5] zypper: remove Paul Eggleton
2013-01-23 12:10 ` [PATCH 2/5] libzypp: remove Paul Eggleton
@ 2013-01-23 12:10 ` Paul Eggleton
2013-01-23 12:10 ` [PATCH 4/5] classes/image-swab: remove zypper-related references Paul Eggleton
2013-01-23 12:10 ` [PATCH 5/5] libcheck: fix HOMEPAGE Paul Eggleton
4 siblings, 0 replies; 6+ messages in thread
From: Paul Eggleton @ 2013-01-23 12:10 UTC (permalink / raw)
To: openembedded-core
This was only needed by libzypp, which has itself been removed.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
...fopen.c-Forward-port-to-zlib-1.2.6-gzFile.patch | 57 ---------
.../sat-solver/sat-solver/cmake.patch | 31 -----
.../sat-solver/sat-solver/db5.patch | 26 ----
.../sat-solver/fix_gcc-4.6.0_compile_issue.patch | 115 ------------------
.../sat-solver/sat-solver/futimes.patch | 32 -----
.../sat-solver/sat-solver/sat-solver_core.patch | 127 --------------------
.../sat-solver/sat-solver_obsolete.patch | 22 ----
.../sat-solver/sat-solver/sat-solver_rpm5.patch | 69 -----------
meta/recipes-extended/sat-solver/sat-solver_git.bb | 67 -----------
9 files changed, 546 deletions(-)
delete mode 100644 meta/recipes-extended/sat-solver/sat-solver/0001-sat_xfopen.c-Forward-port-to-zlib-1.2.6-gzFile.patch
delete mode 100644 meta/recipes-extended/sat-solver/sat-solver/cmake.patch
delete mode 100644 meta/recipes-extended/sat-solver/sat-solver/db5.patch
delete mode 100644 meta/recipes-extended/sat-solver/sat-solver/fix_gcc-4.6.0_compile_issue.patch
delete mode 100644 meta/recipes-extended/sat-solver/sat-solver/futimes.patch
delete mode 100644 meta/recipes-extended/sat-solver/sat-solver/sat-solver_core.patch
delete mode 100644 meta/recipes-extended/sat-solver/sat-solver/sat-solver_obsolete.patch
delete mode 100644 meta/recipes-extended/sat-solver/sat-solver/sat-solver_rpm5.patch
delete mode 100644 meta/recipes-extended/sat-solver/sat-solver_git.bb
diff --git a/meta/recipes-extended/sat-solver/sat-solver/0001-sat_xfopen.c-Forward-port-to-zlib-1.2.6-gzFile.patch b/meta/recipes-extended/sat-solver/sat-solver/0001-sat_xfopen.c-Forward-port-to-zlib-1.2.6-gzFile.patch
deleted file mode 100644
index 402d16e..0000000
--- a/meta/recipes-extended/sat-solver/sat-solver/0001-sat_xfopen.c-Forward-port-to-zlib-1.2.6-gzFile.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From bbbb4fb9b7c85fde90608710dff09480696c6567 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-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 <raj.khem@gmail.com>
-
-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
-
diff --git a/meta/recipes-extended/sat-solver/sat-solver/cmake.patch b/meta/recipes-extended/sat-solver/sat-solver/cmake.patch
deleted file mode 100644
index c1ec86a..0000000
--- a/meta/recipes-extended/sat-solver/sat-solver/cmake.patch
+++ /dev/null
@@ -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 <qing.he@intel.com>
-1/24/2011 - Disable Fedora/Debian checking/settings by Mark Hatle <mark.hatle@windriver.com>
-3/15/2011 - Updated to newer version of sat-solver by Mark Hatle <mark.hatle@windriver.com>
-3/16/2011 - Split original patch and simplify by Mark Hatle <mark.hatle@windriver.com>
-
-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}")
-
diff --git a/meta/recipes-extended/sat-solver/sat-solver/db5.patch b/meta/recipes-extended/sat-solver/sat-solver/db5.patch
deleted file mode 100644
index 6b67912..0000000
--- a/meta/recipes-extended/sat-solver/sat-solver/db5.patch
+++ /dev/null
@@ -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 <mark.hatle@windriver.com>
-
-rebased to sat-solver commit 9e1f2a097965debebc69cebf8ed73c6ff31a5220
-
-Signed-off-by: Qing He <qing.he@intel.com>
-
---- 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"
diff --git a/meta/recipes-extended/sat-solver/sat-solver/fix_gcc-4.6.0_compile_issue.patch b/meta/recipes-extended/sat-solver/sat-solver/fix_gcc-4.6.0_compile_issue.patch
deleted file mode 100644
index 0a55069..0000000
--- a/meta/recipes-extended/sat-solver/sat-solver/fix_gcc-4.6.0_compile_issue.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-Upstream-Status: Pending
-
-Fix the following compilation issues with gcc 4.6.0
-
-| /build_disk/poky_build/build_gcc_4.6.0/tmp/work/qemux86-poky-linux/sat-solver-0.0-git1+0a7378d5f482f477a01cf1690d76871ab8bdcc32-r9/git/ext/repo_updateinfoxml.c: In function 'startElement':
-| /build_disk/poky_build/build_gcc_4.6.0/tmp/work/qemux86-poky-linux/sat-solver-0.0-git1+0a7378d5f482f477a01cf1690d76871ab8bdcc32-r9/git/ext/repo_updateinfoxml.c:278:25: error: variable 'status' set but not used [-Werror=unused-but-set-variable]
-| /build_disk/poky_build/build_gcc_4.6.0/tmp/work/qemux86-poky-linux/sat-solver-0.0-git1+0a7378d5f482f477a01cf1690d76871ab8bdcc32-r9/git/ext/repo_updateinfoxml.c:386:36: error: variable 'src' set but not used [-Werror=unused-but-set-variable]
-| cc1: all warnings being treated as errors
-|
-| make[2]: *** [ext/CMakeFiles/satsolverext.dir/repo_updateinfoxml.o] Error 1
-| make[2]: *** Waiting for unfinished jobs....
-| /build_disk/poky_build/build_gcc_4.6.0/tmp/work/qemux86-poky-linux/sat-solver-0.0-git1+0a7378d5f482f477a01cf1690d76871ab8bdcc32-r9/git/src/transaction.c: In function 'transaction_add_obsoleted':
-| /build_disk/poky_build/build_gcc_4.6.0/tmp/work/qemux86-poky-linux/sat-solver-0.0-git1+0a7378d5f482f477a01cf1690d76871ab8bdcc32-r9/git/src/transaction.c:1933:21: error: variable 'oldcount' set but not used [-Werror=unused-but-set-variable]
-| cc1: all warnings being treated as errors
-|
-| make[2]: *** [src/CMakeFiles/satsolver.dir/transaction.o] Error 1
-| make[2]: Leaving directory `/build_disk/poky_build/build_gcc_4.6.0/tmp/work/qemux86-poky-linux/sat-solver-0.0-git1+0a7378d5f482f477a01cf1690d76871ab8bdcc32-r9/git'
-| make[1]: *** [src/CMakeFiles/satsolver.dir/all] Error 2
-| make[1]: *** Waiting for unfinished jobs....
-| /build_disk/poky_build/build_gcc_4.6.0/tmp/work/qemux86-poky-linux/sat-solver-0.0-git1+0a7378d5f482f477a01cf1690d76871ab8bdcc32-r9/git/ext/repo_rpmdb.c: In function 'rpm_byfp':
-| /build_disk/poky_build/build_gcc_4.6.0/tmp/work/qemux86-poky-linux/sat-solver-0.0-git1+0a7378d5f482f477a01cf1690d76871ab8bdcc32-r9/git/ext/repo_rpmdb.c:2406:20: error: variable 'headerend' set but not used [-Werror=unused-but-set-variable]
-| /build_disk/poky_build/build_gcc_4.6.0/tmp/work/qemux86-poky-linux/sat-solver-0.0-git1+0a7378d5f482f477a01cf1690d76871ab8bdcc32-r9/git/ext/repo_rpmdb.c: In function 'parsekeydata':
-| /build_disk/poky_build/build_gcc_4.6.0/tmp/work/qemux86-poky-linux/sat-solver-0.0-git1+0a7378d5f482f477a01cf1690d76871ab8bdcc32-r9/git/ext/repo_rpmdb.c:2833:29: error: variable 'scr' set but not used [-Werror=unused-but-set-variable]
-| /build_disk/poky_build/build_gcc_4.6.0/tmp/work/qemux86-poky-linux/sat-solver-0.0-git1+0a7378d5f482f477a01cf1690d76871ab8bdcc32-r9/git/ext/repo_rpmdb.c:2669:7: error: variable 'useridl' set but not used [-Werror=unused-but-set-variable]
-| /build_disk/poky_build/build_gcc_4.6.0/tmp/work/qemux86-poky-linux/sat-solver-0.0-git1+0a7378d5f482f477a01cf1690d76871ab8bdcc32-r9/git/ext/repo_rpmdb.c:2667:7: error: variable 'pubkeyl' set but not used [-Werror=unused-but-set-variable]
-| cc1: all warnings being treated as errors
-|
-| make[2]: *** [ext/CMakeFiles/satsolverext.dir/repo_rpmdb.o] Error 1
-| make[2]: Leaving directory `/build_disk/poky_build/build_gcc_4.6.0/tmp/work/qemux86-poky-linux/sat-solver-0.0-git1+0a7378d5f482f477a01cf1690d76871ab8bdcc32-r9/git'
-| make[1]: *** [ext/CMakeFiles/satsolverext.dir/all] Error 2
-| make[1]: Leaving directory `/build_disk/poky_build/build_gcc_4.6.0/tmp/work/qemux86-poky-linux/sat-solver-0.0-git1+0a7378d5f482f477a01cf1690d76871ab8bdcc32-r9/git'
-| make: *** [all] Error 2
-| FATAL: oe_runmake failed
-| ERROR: Function 'do_compile' failed (see /build_disk/poky_build/build_gcc_4.6.0/tmp/work/qemux86-poky-linux/sat-solver-0.0-git1+0a7378d5f482f477a01cf1690d76871ab8bdcc32-r9/temp/log.do_compile.21830 for further information)
-NOTE: package sat-solver-0.0-git1+0a7378d5f482f477a01cf1690d76871ab8bdcc32-r9: task do_compile: Failed
-
-Nitin A Kamble <nitin.a.kamble@intel.com> 2011/05/05
-
-Index: git/src/transaction.c
-===================================================================
---- git.orig/src/transaction.c
-+++ git/src/transaction.c
-@@ -1930,7 +1930,7 @@ transaction_add_obsoleted(Transaction *t
- Repo *installed = pool->installed;
- Id p;
- Solvable *s;
-- int i, j, k, max, oldcount;
-+ int i, j, k, max;
- Map done;
- Queue obsq, *steps;
-
-@@ -1945,7 +1945,6 @@ transaction_add_obsoleted(Transaction *t
- return;
- /* make room */
- steps = &trans->steps;
-- oldcount = steps->count;
- queue_insertn(steps, 0, max);
-
- /* now add em */
-Index: git/ext/repo_updateinfoxml.c
-===================================================================
---- git.orig/ext/repo_updateinfoxml.c
-+++ git/ext/repo_updateinfoxml.c
-@@ -275,7 +275,7 @@ startElement(void *userData, const char
- */
- case STATE_UPDATE:
- {
-- const char *from = 0, *status = 0, *type = 0, *version = 0;
-+ const char *from = 0, __attribute__((__unused__)) *status = 0, *type = 0, *version = 0;
- for (; *atts; atts += 2)
- {
- if (!strcmp(*atts, "from"))
-@@ -383,7 +383,7 @@ startElement(void *userData, const char
- */
- case STATE_PACKAGE:
- {
-- const char *arch = 0, *name = 0, *src = 0;
-+ const char *arch = 0, *name = 0, __attribute__((__unused__)) *src = 0;
- Id evr = makeevr_atts(pool, pd, atts); /* parse "epoch", "version", "release" */
- Id n, a = 0;
- Id rel_id;
-Index: git/ext/repo_rpmdb.c
-===================================================================
---- git.orig/ext/repo_rpmdb.c
-+++ git/ext/repo_rpmdb.c
-@@ -2403,7 +2403,7 @@ void *
- rpm_byfp(FILE *fp, const char *name, void **statep)
- {
- struct rpm_by_state *state = *statep;
-- int headerstart, headerend;
-+ int headerstart, __attribute__((__unused__))headerend;
- RpmHead *rpmhead;
- int sigdsize, sigcnt, l;
- unsigned char lead[4096];
-@@ -2664,9 +2664,9 @@ parsekeydata(Solvable *s, Repodata *data
- unsigned char keyid[8];
- unsigned int kcr = 0, maxex = 0;
- unsigned char *pubkey = 0;
-- int pubkeyl = 0;
-+ int __attribute__((__unused__)) pubkeyl = 0;
- unsigned char *userid = 0;
-- int useridl = 0;
-+ int __attribute__((__unused__)) useridl = 0;
-
- for (; pl; p += l, pl -= l)
- {
-@@ -2830,7 +2830,7 @@ parsekeydata(Solvable *s, Repodata *data
- {
- int j, ql, haveissuer;
- unsigned char *q;
-- unsigned int ex = 0, scr = 0;
-+ unsigned int ex = 0, __attribute__((__unused__))scr = 0;
- unsigned char issuer[8];
-
- // printf("V4 signature packet\n");
diff --git a/meta/recipes-extended/sat-solver/sat-solver/futimes.patch b/meta/recipes-extended/sat-solver/sat-solver/futimes.patch
deleted file mode 100644
index b24d852..0000000
--- a/meta/recipes-extended/sat-solver/sat-solver/futimes.patch
+++ /dev/null
@@ -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 <raj.khem@gmail.com>
-
-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;
- }
diff --git a/meta/recipes-extended/sat-solver/sat-solver/sat-solver_core.patch b/meta/recipes-extended/sat-solver/sat-solver/sat-solver_core.patch
deleted file mode 100644
index 11bf5b0..0000000
--- a/meta/recipes-extended/sat-solver/sat-solver/sat-solver_core.patch
+++ /dev/null
@@ -1,127 +0,0 @@
-Upstream-Status: Inappropriate [distribution]
-
-Fix "arch" integration with Poky.
-
-Add a missing "any" architecture type and update the semantics to use it.
-
-Disable the built-in archpolicies structure, and replace it with one
-we generate in the recipe.
-
-Also add poky semantics option in CMake.
-
-Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
-Signed-off-by: Qing He <qing.he@intel.com>
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 443281e..4456a87 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -45,6 +45,11 @@ MESSAGE(STATUS "Building for Debian")
- ADD_DEFINITIONS( -DDEBIAN -DDEBIAN_SEMANTICS)
- ENDIF ( DEBIAN )
-
-+IF ( OE_CORE )
-+MESSAGE(STATUS "Building for OE core")
-+ADD_DEFINITIONS( -DOE_CORE -DOE_CORE_SEMANTICS)
-+ENDIF ( OE_CORE )
-+
- IF ( MULTI_SEMANTICS )
- MESSAGE(STATUS "Enabling multi dist support")
- ADD_DEFINITIONS( -DMULTI_SEMANTICS)
-diff --git a/src/knownid.h b/src/knownid.h
-index 7757ae0..4b8bee7 100644
---- a/src/knownid.h
-+++ b/src/knownid.h
-@@ -57,6 +57,7 @@ KNOWNID(SYSTEM_SYSTEM, "system:system"),
- KNOWNID(ARCH_SRC, "src"),
- KNOWNID(ARCH_NOSRC, "nosrc"),
- KNOWNID(ARCH_NOARCH, "noarch"),
-+KNOWNID(ARCH_ANY, "any"),
- KNOWNID(ARCH_ALL, "all"),
-
- KNOWNID(REPOSITORY_SOLVABLES, "repository:solvables"),
-diff --git a/src/policy.c b/src/policy.c
-index 55c8677..3356ff8 100644
---- a/src/policy.c
-+++ b/src/policy.c
-@@ -486,6 +486,13 @@ policy_illegal_archchange(Solver *solv, Solvable *s1, Solvable *s2)
- }
-
- /* we allow changes to/from noarch */
-+#ifdef OE_CORE_SEMANTICS
-+ if (a1 == a2 ||
-+ a1 == ARCH_NOARCH || a2 == ARCH_NOARCH ||
-+ a1 == ARCH_ANY || a2 == ARCH_ANY ||
-+ a1 == ARCH_ALL || a2 == ARCH_ALL)
-+ return 0;
-+#else
- #ifndef DEBIAN_SEMANTICS
- if (a1 == a2 || a1 == ARCH_NOARCH || a2 == ARCH_NOARCH)
- return 0;
-@@ -493,6 +500,7 @@ policy_illegal_archchange(Solver *solv, Solvable *s1, Solvable *s2)
- if (a1 == a2 || a1 == ARCH_ALL || a2 == ARCH_ALL)
- return 0;
- #endif
-+#endif
- if (!pool->id2arch)
- return 0;
- a1 = a1 <= pool->lastarch ? pool->id2arch[a1] : 0;
-diff --git a/src/poolarch.c b/src/poolarch.c
-index 34a14a3..2d7cd70 100644
---- a/src/poolarch.c
-+++ b/src/poolarch.c
-@@ -20,38 +20,8 @@
- #include "poolarch.h"
- #include "util.h"
-
--const char *archpolicies[] = {
-- "x86_64", "x86_64:i686:i586:i486:i386",
-- "i686", "i686:i586:i486:i386",
-- "i586", "i586:i486:i386",
-- "i486", "i486:i386",
-- "i386", "i386",
-- "s390x", "s390x:s390",
-- "s390", "s390",
-- "ia64", "ia64:i686:i586:i486:i386",
-- "ppc64", "ppc64:ppc",
-- "ppc", "ppc",
-- "armv7nhl", "armv7nhl:armv7hl",
-- "armv7hl", "armv7hl",
-- "armv7l", "armv7l:armv6l:armv5tejl:armv5tel:armv5l:armv4tl:armv4l:armv3l",
-- "armv6l", "armv6l:armv5tejl:armv5tel:armv5l:armv4tl:armv4l:armv3l",
-- "armv5tejl", "armv5tejl:armv5tel:armv5l:armv4tl:armv4l:armv3l",
-- "armv5tel", "armv5tel:armv5l:armv4tl:armv4l:armv3l",
-- "armv5l", "armv5l:armv4tl:armv4l:armv3l",
-- "armv4tl", "armv4tl:armv4l:armv3l",
-- "armv4l", "armv4l:armv3l",
-- "armv3l", "armv3l",
-- "sh3", "sh3",
-- "sh4", "sh4",
-- "sh4a", "sh4a:sh4",
-- "sparc64v", "sparc64v:sparc64:sparcv9v:sparcv9:sparcv8:sparc",
-- "sparc64", "sparc64:sparcv9:sparcv8:sparc",
-- "sparcv9v", "sparcv9v:sparcv9:sparcv8:sparc",
-- "sparcv9", "sparcv9:sparcv8:sparc",
-- "sparcv8", "sparcv8:sparc",
-- "sparc", "sparc",
-- 0
--};
-+/* Provide the const char *archpolicies structure */
-+#include "core-arch.h"
-
- void
- pool_setarch(Pool *pool, const char *arch)
-@@ -71,10 +41,10 @@ pool_setarch(Pool *pool, const char *arch)
- pool->lastarch = 0;
- return;
- }
--#ifndef DEBIAN_SEMANTICS
-- id = ARCH_NOARCH;
--#else
-+#if defined(DEBIAN_SEMANTICS) || defined(OE_CORE_SEMANTICS)
- id = ARCH_ALL;
-+#else
-+ id = ARCH_NOARCH;
- #endif
- lastarch = id + 255;
- id2arch = sat_calloc(lastarch + 1, sizeof(Id));
diff --git a/meta/recipes-extended/sat-solver/sat-solver/sat-solver_obsolete.patch b/meta/recipes-extended/sat-solver/sat-solver/sat-solver_obsolete.patch
deleted file mode 100644
index 60483e9..0000000
--- a/meta/recipes-extended/sat-solver/sat-solver/sat-solver_obsolete.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Upstream-Status: Pending
-
-Fix obsolete settings with RPM5.
-
-The following patch is from Michael Schroeder <mls@suse.de>
-
-Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
-
-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;
- }
-
diff --git a/meta/recipes-extended/sat-solver/sat-solver/sat-solver_rpm5.patch b/meta/recipes-extended/sat-solver/sat-solver/sat-solver_rpm5.patch
deleted file mode 100644
index d59c513..0000000
--- a/meta/recipes-extended/sat-solver/sat-solver/sat-solver_rpm5.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-Upstream-Status: Pending
-
-Add RPM5 configuration support
-
-Update the cmake configuration to detect additional files needed by RPM5.
-
-Original work by Qing He <qing.he@intel.com>.
-
-Merged and updated to make this more likely to be accepted upstream.
-
-Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
-
-diff -ur git.orig/CMakeLists.txt git/CMakeLists.txt
---- git.orig/CMakeLists.txt 2011-03-16 16:16:29.152786178 -0500
-+++ git/CMakeLists.txt 2011-03-16 16:29:43.532032285 -0500
-@@ -50,7 +50,16 @@
- ADD_DEFINITIONS( -DMULTI_SEMANTICS)
- ENDIF ( MULTI_SEMANTICS )
-
--IF ( NOT DEBIAN )
-+if ( RPM5 )
-+MESSAGE(STATUS "Enabling RPM 5 support")
-+ADD_DEFINITIONS( -DRPM5)
-+
-+FIND_PACKAGE(PkgConfig REQUIRED)
-+PKG_CHECK_MODULES(RPM REQUIRED rpm)
-+INCLUDE_DIRECTORIES( ${RPM_INCLUDE_DIRS} )
-+ENDIF ( RPM5 )
-+
-+IF ( RPM5 OR NOT DEBIAN )
- FIND_LIBRARY(RPMDB_LIBRARY NAMES rpmdb)
- IF ( NOT RPMDB_LIBRARY )
- FIND_LIBRARY(RPMDB_LIBRARY NAMES rpm)
-@@ -59,13 +68,17 @@
- IF ( RPMIO_LIBRARY )
- SET( RPMDB_LIBRARY ${RPMIO_LIBRARY} ${RPMDB_LIBRARY} )
- ENDIF ( RPMIO_LIBRARY )
--IF ( FEDORA )
-+FIND_LIBRARY(RPMMISC_LIBRARY NAMES rpmmisc)
-+IF ( RPMMISC_LIBRARY )
-+SET ( RPMDB_LIBRARY ${RPMMISC_LIBRARY} ${RPMDB_LIBRARY} )
-+ENDIF ( RPMMISC_LIBRARY )
-+IF ( RPM5 OR FEDORA )
- FIND_LIBRARY(DB_LIBRARY NAMES db)
- IF ( DB_LIBRARY )
- SET( RPMDB_LIBRARY ${DB_LIBRARY} ${RPMDB_LIBRARY} )
- ENDIF ( DB_LIBRARY )
--ENDIF ( FEDORA )
--ENDIF ( NOT DEBIAN )
-+ENDIF ( RPM5 OR FEDORA )
-+ENDIF ( RPM5 OR NOT DEBIAN )
-
- INCLUDE ( CheckFunctionExists )
- INCLUDE ( TestBigEndian )
-diff -ur git.orig/ext/repo_rpmdb.c git/ext/repo_rpmdb.c
---- git.orig/ext/repo_rpmdb.c 2011-03-16 18:03:55.401907738 -0500
-+++ git/ext/repo_rpmdb.c 2011-03-16 18:04:47.472989651 -0500
-@@ -3039,7 +3039,11 @@
- repodata_set_str(data, s - s->repo->pool->solvables, PUBKEY_KEYID, keyid);
- if (dig->pubkey.userid)
- setutf8string(data, s - s->repo->pool->solvables, SOLVABLE_SUMMARY, dig->pubkey.userid);
-+#ifndef RPM5
- (void)pgpFreeDig(dig);
-+#else
-+ (void)pgpDigFree(dig);
-+#endif
- sat_free((void *)pkts);
- return 1;
- }
diff --git a/meta/recipes-extended/sat-solver/sat-solver_git.bb b/meta/recipes-extended/sat-solver/sat-solver_git.bb
deleted file mode 100644
index 67503b7..0000000
--- a/meta/recipes-extended/sat-solver/sat-solver_git.bb
+++ /dev/null
@@ -1,67 +0,0 @@
-DESCRIPTION = "Sat Solver"
-HOMEPAGE = "http://http://en.opensuse.org/openSUSE:Libzypp_satsolver"
-
-LICENSE = "BSD"
-LIC_FILES_CHKSUM = "file://LICENSE.BSD;md5=62272bd11c97396d4aaf1c41bc11f7d8"
-
-DEPENDS = "libcheck rpm zlib expat db"
-
-SRCREV = "0a7378d5f482f477a01cf1690d76871ab8bdcc32"
-PV = "0.0-git${SRCPV}"
-PR = "r14"
-
-PARALLEL_MAKE=""
-
-SRC_URI = "git://github.com/openSUSE/sat-solver.git;protocol=git \
- file://sat-solver_rpm5.patch \
- file://sat-solver_obsolete.patch \
- file://cmake.patch \
- file://db5.patch \
- file://sat-solver_core.patch \
- file://fix_gcc-4.6.0_compile_issue.patch \
- file://0001-sat_xfopen.c-Forward-port-to-zlib-1.2.6-gzFile.patch \
- file://futimes.patch \
- "
-
-S = "${WORKDIR}/git"
-
-EXTRA_OECMAKE += "-DRPM5=RPM5 -DOE_CORE=OE_CORE"
-
-EXTRA_OECMAKE += " -DLIB=${@os.path.basename('${libdir}')}"
-
-TUNE_CCARGS_append_libc-uclibc = " -DUSE_OWN_QSORT=1 "
-
-inherit cmake pkgconfig
-
-RDEPENDS_${PN} = "rpm-libs"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-do_archgen () {
- # We need to dynamically generate our arch file based on the machine
- # configuration
-
- INSTALL_PLATFORM_ARCHS=""
- for each_arch in ${PACKAGE_ARCHS} ; do
- case "$each_arch" in
- all | any | noarch)
- continue;;
- esac
- INSTALL_PLATFORM_ARCHS="`echo $each_arch | sed 's/-/_/g'` $INSTALL_PLATFORM_ARCHS"
- done
-
- echo "/* Automatically generated by the sat-solver recipe */" > src/core-arch.h
- echo "const char *archpolicies[] = {" >> src/core-arch.h
-
- set -- $INSTALL_PLATFORM_ARCHS
-
- save_IFS=$IFS
- IFS=:
- while [ $# -gt 0 ]; do echo " \"$1\", "\""$*"\", >> src/core-arch.h ; shift; done
- IFS=$save_IFS
-
- echo " 0" >> src/core-arch.h
- echo "};" >> src/core-arch.h
-}
-
-addtask archgen before do_configure after do_patch
--
1.7.10.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 4/5] classes/image-swab: remove zypper-related references
2013-01-23 12:10 [PATCH 0/5] Zypper removal Paul Eggleton
` (2 preceding siblings ...)
2013-01-23 12:10 ` [PATCH 3/5] sat-solver: remove Paul Eggleton
@ 2013-01-23 12:10 ` Paul Eggleton
2013-01-23 12:10 ` [PATCH 5/5] libcheck: fix HOMEPAGE Paul Eggleton
4 siblings, 0 replies; 6+ messages in thread
From: Paul Eggleton @ 2013-01-23 12:10 UTC (permalink / raw)
To: openembedded-core
Remove references to libzypp, zypper and sat-solver which have been
removed.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
meta/classes/image-swab.bbclass | 3 ---
1 file changed, 3 deletions(-)
diff --git a/meta/classes/image-swab.bbclass b/meta/classes/image-swab.bbclass
index ba30f01..124a090 100644
--- a/meta/classes/image-swab.bbclass
+++ b/meta/classes/image-swab.bbclass
@@ -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
--
1.7.10.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 5/5] libcheck: fix HOMEPAGE
2013-01-23 12:10 [PATCH 0/5] Zypper removal Paul Eggleton
` (3 preceding siblings ...)
2013-01-23 12:10 ` [PATCH 4/5] classes/image-swab: remove zypper-related references Paul Eggleton
@ 2013-01-23 12:10 ` Paul Eggleton
4 siblings, 0 replies; 6+ messages in thread
From: Paul Eggleton @ 2013-01-23 12:10 UTC (permalink / raw)
To: openembedded-core
This was pointing to the zypper homepage, presumably a copy-paste error.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
meta/recipes-support/libcheck/libcheck_0.9.9.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-support/libcheck/libcheck_0.9.9.bb b/meta/recipes-support/libcheck/libcheck_0.9.9.bb
index f3fa546..64bc714 100644
--- a/meta/recipes-support/libcheck/libcheck_0.9.9.bb
+++ b/meta/recipes-support/libcheck/libcheck_0.9.9.bb
@@ -1,5 +1,5 @@
DESCRIPTION = "Check Test Framework"
-HOMEPAGE = "http://gitorious.org/opensuse/zypper"
+HOMEPAGE = "http://check.sourceforge.net/"
SECTION = "devel"
LICENSE = "LGPLv2.1+"
--
1.7.10.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2013-01-23 12:26 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-01-23 12:10 [PATCH 0/5] Zypper removal Paul Eggleton
2013-01-23 12:10 ` [PATCH 1/5] zypper: remove Paul Eggleton
2013-01-23 12:10 ` [PATCH 2/5] libzypp: remove Paul Eggleton
2013-01-23 12:10 ` [PATCH 3/5] sat-solver: remove Paul Eggleton
2013-01-23 12:10 ` [PATCH 4/5] classes/image-swab: remove zypper-related references Paul Eggleton
2013-01-23 12:10 ` [PATCH 5/5] libcheck: fix HOMEPAGE Paul Eggleton
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox