diff options
| author | Qing He <qing.he@intel.com> | 2011-01-11 17:09:12 +0800 |
|---|---|---|
| committer | Saul Wold <sgw@linux.intel.com> | 2011-01-30 12:09:52 -0800 |
| commit | 114cee75bd4753c19b254a6d81b4d1284cbfa863 (patch) | |
| tree | 81614d9759140182fd757b94461402342c33e19c /meta | |
| parent | 483ee172cf522969a7e5eb7f81ba2be412db9ee4 (diff) | |
| download | openembedded-core-114cee75bd4753c19b254a6d81b4d1284cbfa863.tar.gz openembedded-core-114cee75bd4753c19b254a6d81b4d1284cbfa863.tar.bz2 openembedded-core-114cee75bd4753c19b254a6d81b4d1284cbfa863.tar.xz openembedded-core-114cee75bd4753c19b254a6d81b4d1284cbfa863.zip | |
zypper: upgrade to newer git version
this works with rpm 5.4.0
Signed-off-by: Qing He <qing.he@intel.com>
Diffstat (limited to 'meta')
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 de3a1e386..0c3aa9aff 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" SRCDATE_yaffs2-utils-native ??= "20071107" SRCDATE_yaffs2-utils ??= "20071107" SRCREV_pn-zaurusd ??= "426" -SRCREV_pn-zypper ??= "9eb0e248e06c8d20ad054be2439149d9ede37531" +SRCREV_pn-zypper ??= "2c5bb6ceb99ecd950ef993e43d77bf0569ea0582" 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 0da196f5b..a7d3fbe50 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 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 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 000000000..4403869cd --- /dev/null +++ b/meta/recipes-extended/zypper/zypper/rpm5-flag.patch @@ -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" ) diff --git a/meta/recipes-extended/zypper/zypper_git.bb b/meta/recipes-extended/zypper/zypper_git.bb index b9e2e8594..729eabdaa 100644 --- a/meta/recipes-extended/zypper/zypper_git.bb +++ b/meta/recipes-extended/zypper/zypper_git.bb @@ -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}" |