mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-02-15 21:23:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

zypper: upgrade to newer git version

Browse Source 
this works with rpm 5.4.0

Signed-off-by: Qing He <qing.he@intel.com>
This commit is contained in:
Qing He
2011-01-11 17:09:12 +08:00
committed by Saul Wold
parent 483ee172cf
commit 114cee75bd
4 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
meta/conf/distro/include/poky-default-revisions.inc
View File

@@ -194,5 +194,5 @@ SRCREV_pn-x-load ??= "6f3a26101303051e0f91b6213735b68ce804e94e"
SRCDATE_yaffs2-utils-native ??= "20071107"
SRCDATE_yaffs2-utils ??= "20071107"
SRCREV_pn-zaurusd ??= "426"
SRCREV_pn-zypper ??= "9eb0e248e06c8d20ad054be2439149d9ede37531"
SRCREV_pn-zypper ??= "2c5bb6ceb99ecd950ef993e43d77bf0569ea0582"

6
meta/recipes-extended/zypper/zypper/dso_linking_change_build_fix.patch
View File

@@ -42,8 +42,8 @@ Index: git/src/CMakeLists.txt
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} )
+TARGET_LINK_LIBRARIES( zypper zypper_lib ${ZYPP_LIBRARY} ${READLINE_LIBRARY} -laugeas ${AUGEAS_LIBRARY} pthread rt )
-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(
@@ -52,7 +52,7 @@ Index: git/src/CMakeLists.txt
# zypp-refresh utility
ADD_EXECUTABLE( zypp-refresh zypp-refresh.cc )
-TARGET_LINK_LIBRARIES( zypp-refresh ${ZYPP_LIBRARY} )
+TARGET_LINK_LIBRARIES( zypp-refresh ${ZYPP_LIBRARY} pthread )
+TARGET_LINK_LIBRARIES( zypp-refresh ${ZYPP_LIBRARY} -lpthread )
INSTALL(
TARGETS zypp-refresh
RUNTIME DESTINATION ${INSTALL_PREFIX}/sbin

16
meta/recipes-extended/zypper/zypper/rpm5-flag.patch Normal file
View File

@@ -0,0 +1,16 @@
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" )

6
meta/recipes-extended/zypper/zypper_git.bb
View File

@@ -12,7 +12,9 @@ inherit cmake
SRC_URI = "git://gitorious.org/opensuse/zypper.git;protocol=git \
file://cmake.patch \
file://dso_linking_change_build_fix.patch "
file://dso_linking_change_build_fix.patch \
file://rpm5-flag.patch \
"
S = "${WORKDIR}/git"
PV = "1.4.7-git${SRCPV}"
PV = "1.5.3-git${SRCPV}"