summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/conf/distro/include/poky-default-revisions.inc2
-rw-r--r--meta/recipes-extended/zypper/zypper/dso_linking_change_build_fix.patch6
-rw-r--r--meta/recipes-extended/zypper/zypper/rpm5-flag.patch16
-rw-r--r--meta/recipes-extended/zypper/zypper_git.bb6
4 files changed, 24 insertions, 6 deletions
diff --git a/meta/conf/distro/include/poky-default-revisions.inc b/meta/conf/distro/include/poky-default-revisions.inc
index de3a1e386b..0c3aa9aff0 100644
--- a/meta/conf/distro/include/poky-default-revisions.inc
+++ b/meta/conf/distro/include/poky-default-revisions.inc
@@ -194,5 +194,5 @@ SRCREV_pn-x-load ??= "6f3a26101303051e0f91b6213735b68ce804e94e"
194SRCDATE_yaffs2-utils-native ??= "20071107" 194SRCDATE_yaffs2-utils-native ??= "20071107"
195SRCDATE_yaffs2-utils ??= "20071107" 195SRCDATE_yaffs2-utils ??= "20071107"
196SRCREV_pn-zaurusd ??= "426" 196SRCREV_pn-zaurusd ??= "426"
197SRCREV_pn-zypper ??= "9eb0e248e06c8d20ad054be2439149d9ede37531" 197SRCREV_pn-zypper ??= "2c5bb6ceb99ecd950ef993e43d77bf0569ea0582"
198 198
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
index 0da196f5be..a7d3fbe50c 100644
--- a/meta/recipes-extended/zypper/zypper/dso_linking_change_build_fix.patch
+++ b/meta/recipes-extended/zypper/zypper/dso_linking_change_build_fix.patch
@@ -42,8 +42,8 @@ Index: git/src/CMakeLists.txt
42 TARGET_LINK_LIBRARIES( zypper_lib ${ZYPP_LIBRARY} ${READLINE_LIBRARY} -laugeas ${AUGEAS_LIBRARY} ) 42 TARGET_LINK_LIBRARIES( zypper_lib ${ZYPP_LIBRARY} ${READLINE_LIBRARY} -laugeas ${AUGEAS_LIBRARY} )
43 43
44 ADD_EXECUTABLE( zypper main.cc ) 44 ADD_EXECUTABLE( zypper main.cc )
45-TARGET_LINK_LIBRARIES( zypper zypper_lib ${ZYPP_LIBRARY} ${READLINE_LIBRARY} -laugeas ${AUGEAS_LIBRARY} ) 45-TARGET_LINK_LIBRARIES( zypper zypper_lib ${ZYPP_LIBRARY} ${READLINE_LIBRARY} -laugeas ${AUGEAS_LIBRARY} -lrt )
46+TARGET_LINK_LIBRARIES( zypper zypper_lib ${ZYPP_LIBRARY} ${READLINE_LIBRARY} -laugeas ${AUGEAS_LIBRARY} pthread rt ) 46+TARGET_LINK_LIBRARIES( zypper zypper_lib ${ZYPP_LIBRARY} ${READLINE_LIBRARY} -laugeas ${AUGEAS_LIBRARY} -lrt -lpthread )
47 47
48 48
49 INSTALL( 49 INSTALL(
@@ -52,7 +52,7 @@ Index: git/src/CMakeLists.txt
52 # zypp-refresh utility 52 # zypp-refresh utility
53 ADD_EXECUTABLE( zypp-refresh zypp-refresh.cc ) 53 ADD_EXECUTABLE( zypp-refresh zypp-refresh.cc )
54-TARGET_LINK_LIBRARIES( zypp-refresh ${ZYPP_LIBRARY} ) 54-TARGET_LINK_LIBRARIES( zypp-refresh ${ZYPP_LIBRARY} )
55+TARGET_LINK_LIBRARIES( zypp-refresh ${ZYPP_LIBRARY} pthread ) 55+TARGET_LINK_LIBRARIES( zypp-refresh ${ZYPP_LIBRARY} -lpthread )
56 INSTALL( 56 INSTALL(
57 TARGETS zypp-refresh 57 TARGETS zypp-refresh
58 RUNTIME DESTINATION ${INSTALL_PREFIX}/sbin 58 RUNTIME DESTINATION ${INSTALL_PREFIX}/sbin
diff --git a/meta/recipes-extended/zypper/zypper/rpm5-flag.patch b/meta/recipes-extended/zypper/zypper/rpm5-flag.patch
new file mode 100644
index 0000000000..4403869cd2
--- /dev/null
+++ b/meta/recipes-extended/zypper/zypper/rpm5-flag.patch
@@ -0,0 +1,16 @@
1It's required by libzypp headers
2
3Signed-off-by: Qing He <qing.he@intel.com>
4
5diff --git a/CMakeLists.txt b/CMakeLists.txt
6index 6b040a6..84431c8 100644
7--- a/CMakeLists.txt
8+++ b/CMakeLists.txt
9@@ -15,6 +15,7 @@ INCLUDE( ${ZYPPER_SOURCE_DIR}/VERSION.cmake )
10 SET( VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}" )
11 ADD_DEFINITIONS( -D_FILE_OFFSET_BITS=64 )
12 ADD_DEFINITIONS( -DVERSION="${VERSION}" )
13+ADD_DEFINITIONS( -D_RPM_5 )
14
15 SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O2 -Wall -Woverloaded-virtual -fstack-protector" )
16 SET( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -O2 -Wall -fstack-protector" )
diff --git a/meta/recipes-extended/zypper/zypper_git.bb b/meta/recipes-extended/zypper/zypper_git.bb
index b9e2e85943..729eabdaa8 100644
--- a/meta/recipes-extended/zypper/zypper_git.bb
+++ b/meta/recipes-extended/zypper/zypper_git.bb
@@ -12,7 +12,9 @@ inherit cmake
12 12
13SRC_URI = "git://gitorious.org/opensuse/zypper.git;protocol=git \ 13SRC_URI = "git://gitorious.org/opensuse/zypper.git;protocol=git \
14 file://cmake.patch \ 14 file://cmake.patch \
15 file://dso_linking_change_build_fix.patch " 15 file://dso_linking_change_build_fix.patch \
16 file://rpm5-flag.patch \
17 "
16S = "${WORKDIR}/git" 18S = "${WORKDIR}/git"
17 19
18PV = "1.4.7-git${SRCPV}" 20PV = "1.5.3-git${SRCPV}"