diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2013-01-23 12:10:10 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-01-24 20:09:00 +0000 |
commit | e90fad58faf9e25479158359c528999b09be1a02 (patch) | |
tree | 4e50bee32d6e74ea37a9c37f9c7cb3e606354780 /meta/recipes-extended/zypper/zypper/rpm5-flag.patch | |
parent | 1f8f6fe4eb6884ac3a254d4ef54c7841e407ecab (diff) | |
download | poky-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>
Diffstat (limited to 'meta/recipes-extended/zypper/zypper/rpm5-flag.patch')
-rw-r--r-- | meta/recipes-extended/zypper/zypper/rpm5-flag.patch | 18 |
1 files changed, 0 insertions, 18 deletions
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 89564a60f7..0000000000 --- a/meta/recipes-extended/zypper/zypper/rpm5-flag.patch +++ /dev/null | |||
@@ -1,18 +0,0 @@ | |||
1 | Upstream-Status: Inappropriate [configuration] | ||
2 | |||
3 | It's required by libzypp headers | ||
4 | |||
5 | Signed-off-by: Qing He <qing.he@intel.com> | ||
6 | |||
7 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
8 | index 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" ) | ||