summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2013-01-23 12:10:10 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-01-24 20:09:00 (GMT)
commite90fad58faf9e25479158359c528999b09be1a02 (patch)
tree4e50bee32d6e74ea37a9c37f9c7cb3e606354780
parent1f8f6fe4eb6884ac3a254d4ef54c7841e407ecab (diff)
downloadpoky-e90fad58faf9e25479158359c528999b09be1a02.tar.gz
zypper: remove
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]. (From OE-Core rev: cc866433341532a0b5cf8cd5f67998960ea96499) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/zypper/zypper/cmake.patch22
-rw-r--r--meta/recipes-extended/zypper/zypper/cmake_libxml2.patch28
-rw-r--r--meta/recipes-extended/zypper/zypper/dso_linking_change_build_fix.patch60
-rw-r--r--meta/recipes-extended/zypper/zypper/gcc-scope.patch20
-rw-r--r--meta/recipes-extended/zypper/zypper/rpm5-flag.patch18
-rw-r--r--meta/recipes-extended/zypper/zypper/rpmatch.patch23
-rw-r--r--meta/recipes-extended/zypper/zypper_git.bb29
7 files changed, 0 insertions, 200 deletions
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 @@
1Upstream-Status: Inappropriate [configuration]
2
3without the patch, /usr/include/rpm/ won't be added
4in cppflags
5
68/19/2010 - created by Qing He <qing.he@intel.com>
7
8diff --git a/CMakeLists.txt b/CMakeLists.txt
9index 6b040a6..04a1595 100644
10--- a/CMakeLists.txt
11+++ b/CMakeLists.txt
12@@ -21,6 +21,10 @@ SET( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -O2 -Wall -fstack-protector" )
13
14 GENERATE_PACKAGING(${PACKAGE} ${VERSION})
15
16+FIND_PACKAGE(PkgConfig REQUIRED)
17+PKG_CHECK_MODULES(RPM REQUIRED rpm)
18+INCLUDE_DIRECTORIES( ${RPM_INCLUDE_DIRS} )
19+
20 FIND_PACKAGE( Zypp REQUIRED )
21 IF( ZYPP_FOUND )
22 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 @@
1Upstream-Status: Pending
2
3Signed-off-by: Saul Wold <sgw@linux.intel.com>
4
5Index: git/CMakeLists.txt
6===================================================================
7--- git.orig/CMakeLists.txt 2011-12-20 15:13:59.851209493 -0800
8+++ git/CMakeLists.txt 2011-12-20 15:14:51.167211302 -0800
9@@ -25,6 +25,9 @@
10 PKG_CHECK_MODULES(RPM REQUIRED rpm)
11 INCLUDE_DIRECTORIES( ${RPM_INCLUDE_DIRS} )
12
13+PKG_CHECK_MODULES(LIBXML REQUIRED libxml-2.0)
14+INCLUDE_DIRECTORIES( ${LIBXML_INCLUDE_DIRS} )
15+
16 FIND_PACKAGE( Zypp REQUIRED )
17 IF( ZYPP_FOUND )
18 INCLUDE_DIRECTORIES(${ZYPP_INCLUDE_DIR})
19@@ -70,6 +73,9 @@
20 INCLUDE(CTest)
21 ENABLE_TESTING()
22
23+# New Augeas requires libxml now
24+PKG_CHECK_MODULES(LIBXML REQUIRED libxml-2.0)
25+INCLUDE_DIRECTORIES( ${LIBXML_INCLUDE_DIRS} )
26
27 # documentation too important to be hidden in doc:
28 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 @@
1Upstream-Status: Pending
2
3after gcc linking has changed, all the libraries must be explicitely specified
4This patch avoids these linking errors:
5
6| Linking CXX executable zypp-refresh
7| 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
8| /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
9| /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
10| /build_disk/poky_build/build0/tmp/sysroots/i586-poky-linux/lib/libpthread.so.0: could not read symbols: Bad value
11| collect2: ld returned 1 exit status
12| make[2]: *** [src/zypp-refresh] Error 1
13| make[2]: Leaving directory `/build_disk/poky_build/build0/tmp/work/i586-poky-linux/zypper-1.4.7-git0+9eb0e248e06c8d20ad054be2439149d9ede37531-r2/git'
14| make[1]: *** [src/CMakeFiles/zypp-refresh.dir/all] Error 2
15
16
17| Linking CXX executable zypper
18| 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
19| /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
20| /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
21| /build_disk/poky_build/build0/tmp/sysroots/i586-poky-linux/lib/libpthread.so.0: could not read symbols: Bad value
22| collect2: ld returned 1 exit status
23| make[2]: *** [src/zypper] Error 1
24
25
26| Linking CXX executable zypper
27| 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
28| /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
29| /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
30| /build_disk/poky_build/build0/tmp/sysroots/i586-poky-linux/lib/librt.so.1: could not read symbols: Bad value
31| collect2: ld returned 1 exit status
32| make[2]: *** [src/zypper] Error 1
33
34
35Nitin A Kamble <nitin.a.kamble@intel.com>
36Date: 2011/01/19
37
38
39Index: git/src/CMakeLists.txt
40===================================================================
41--- git.orig/src/CMakeLists.txt 2010-12-20 00:02:02.000000000 -0800
42+++ git/src/CMakeLists.txt 2011-01-19 09:23:13.432758255 -0800
43@@ -93,7 +93,7 @@
44 TARGET_LINK_LIBRARIES( zypper_lib ${ZYPP_LIBRARY} ${READLINE_LIBRARY} -laugeas ${AUGEAS_LIBRARY} )
45
46 ADD_EXECUTABLE( zypper main.cc )
47-TARGET_LINK_LIBRARIES( zypper zypper_lib ${ZYPP_LIBRARY} ${READLINE_LIBRARY} -laugeas ${AUGEAS_LIBRARY} -lrt )
48+TARGET_LINK_LIBRARIES( zypper zypper_lib ${ZYPP_LIBRARY} ${READLINE_LIBRARY} -laugeas ${AUGEAS_LIBRARY} -lrt -lpthread )
49
50
51 INSTALL(
52@@ -115,7 +115,7 @@
53
54 # zypp-refresh utility
55 ADD_EXECUTABLE( zypp-refresh zypp-refresh.cc )
56-TARGET_LINK_LIBRARIES( zypp-refresh ${ZYPP_LIBRARY} )
57+TARGET_LINK_LIBRARIES( zypp-refresh ${ZYPP_LIBRARY} -lpthread )
58 INSTALL(
59 TARGETS zypp-refresh
60 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 @@
1Fix errors like below
2
3| /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
4| /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
5
6Signed-off-by: Khem Raj <raj.khem@gmail.com>
7
8Upstream-Status: Pending
9Index: git/src/utils/console.cc
10===================================================================
11--- git.orig/src/utils/console.cc 2012-03-27 19:12:06.171036356 -0700
12+++ git/src/utils/console.cc 2012-03-27 19:12:52.887038622 -0700
13@@ -15,6 +15,7 @@
14 #include <readline/readline.h>
15 #include <readline/history.h>
16 #include <cstdlib>
17+#include <unistd.h>
18
19 using namespace std;
20
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 @@
1Upstream-Status: Inappropriate [configuration]
2
3It's required by libzypp headers
4
5Signed-off-by: Qing He <qing.he@intel.com>
6
7diff --git a/CMakeLists.txt b/CMakeLists.txt
8index 6b040a6..84431c8 100644
9--- a/CMakeLists.txt
10+++ b/CMakeLists.txt
11@@ -15,6 +15,7 @@ INCLUDE( ${ZYPPER_SOURCE_DIR}/VERSION.cmake )
12 SET( VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}" )
13 ADD_DEFINITIONS( -D_FILE_OFFSET_BITS=64 )
14 ADD_DEFINITIONS( -DVERSION="${VERSION}" )
15+ADD_DEFINITIONS( -D_RPM_5 )
16
17 SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O2 -Wall -Woverloaded-virtual -fstack-protector" )
18 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 @@
1rpmatch() is missing in uclibc so we provide a local definition
2in form of a macro
3
4Signed-off-by: Khem Raj <raj.khem@gmail.com>
5Upstream-Status: Pending
6
7Index: git/src/utils/prompt.h
8===================================================================
9--- git.orig/src/utils/prompt.h 2012-06-06 15:51:00.899112775 -0700
10+++ git/src/utils/prompt.h 2012-06-06 15:52:17.003116762 -0700
11@@ -172,4 +172,12 @@
12 return errstr;
13 }
14
15+#ifdef __UCLIBC__
16+#define rpmatch(line) \
17+ ( (line == NULL)? -1 : \
18+ (*line == 'y' || *line == 'Y')? 1 : \
19+ (*line == 'n' || *line == 'N')? 0 : \
20+ -1 )
21+#endif /* __UCLIBC__ */
22+
23 #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 @@
1HOMEPAGE = "http://gitorious.org/opensuse/zypper"
2DESCRIPTION = "The ZYpp Linux Software management framework"
3
4LICENSE = "GPLv2+"
5LIC_FILES_CHKSUM = "file://COPYING;md5=3201406e350b39e05a82e28b5020f413"
6
7DEPENDS = "libzypp augeas"
8PR = "r3"
9SRCREV = "2c5bb6ceb99ecd950ef993e43d77bf0569ea0582"
10
11inherit cmake
12
13SRC_URI = "git://github.com/openSUSE/zypper.git;protocol=git \
14 file://cmake.patch \
15 file://cmake_libxml2.patch \
16 file://dso_linking_change_build_fix.patch \
17 file://rpm5-flag.patch \
18 file://gcc-scope.patch \
19 file://rpmatch.patch \
20 "
21S = "${WORKDIR}/git"
22
23PV = "1.5.3-git${SRCPV}"
24
25RDEPENDS_${PN} = "rpm-libs"
26RRECOMMENDS_${PN} = "procps util-linux-uuidgen"
27
28PACKAGE_ARCH = "${MACHINE_ARCH}"
29OECMAKE_CXX_LINK_FLAGS_libc-uclibc += "-lintl"