List:Commits« Previous MessageNext Message »
From:Joerg Bruehe Date:June 12 2012 9:03am
Subject:bzr push into mysql-5.5 branch (joerg.bruehe:3870 to 3871)
View as plain text  
 3871 Joerg Bruehe	2012-06-12
      Still work on getting the "SPECIFIC-ULN/" files into the build.
      
      "INSTALL" was wrong, happens too late,
      but "CONFIGURE_FILES(... COPYONLY)" should hopefully do it.
      
      Traditional RPMs need to be checked, the above might fix their issues.

    modified:
      SPECIFIC-ULN/CMakeLists.txt
      support-files/mysql.spec.sh
 3870 Joerg Bruehe	2012-06-11
      Protect traditional RPMs that "SPECIFIC-ULN/" will not break their packaging.

    modified:
      SPECIFIC-ULN/CMakeLists.txt
      support-files/mysql.spec.sh
=== modified file 'SPECIFIC-ULN/CMakeLists.txt'
--- a/SPECIFIC-ULN/CMakeLists.txt	2012-06-11 20:07:24 +0000
+++ b/SPECIFIC-ULN/CMakeLists.txt	2012-06-12 09:01:41 +0000
@@ -26,27 +26,12 @@ IF(UNIX)
   # Left in current directory, to be taken during build
   CONFIGURE_FILE(mysql.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/${SPECFILENAME} @ONLY)
 
-  SET(PATCHES
-      mysql-5.5-errno.patch
-      mysql-5.5-fix-tests.patch
-      mysql-5.5-libdir.patch
-      mysql-5.5-mtr1.patch
-      mysql-5.5-stack-guard.patch
-      mysql-5.5-testing.patch
-      mysql-chain-certs.patch
-      mysql-expired-certs.patch
-      mysql-install-test.patch
-      mysql-strmov.patch)
-
-  SET(OTHER
-      filter-requires-mysql.sh
-      generate-tarball.sh
-      my.cnf
-      my_config.h
-      mysql-embedded-check.c
-      mysql.init
-      scriptstub.c)
-
-  INSTALL(FILES ${PATCHES} ${OTHER} DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+  FOREACH(ulnfile filter-requires-mysql.sh generate-tarball.sh my.cnf my_config.h
+          mysql-5.5-errno.patch mysql-5.5-fix-tests.patch mysql-5.5-libdir.patch
+          mysql-5.5-mtr1.patch mysql-5.5-stack-guard.patch mysql-5.5-testing.patch
+          mysql-chain-certs.patch mysql-embedded-check.c mysql-expired-certs.patch
+          mysql.init mysql-install-test.patch mysql-strmov.patch scriptstub.c)
+    CONFIGURE_FILE(${ulnfile} ${CMAKE_CURRENT_BINARY_DIR}/${ulnfile} COPYONLY)
+  ENDFOREACH()
 ENDIF()
 

=== modified file 'support-files/mysql.spec.sh'
--- a/support-files/mysql.spec.sh	2012-06-11 20:07:24 +0000
+++ b/support-files/mysql.spec.sh	2012-06-12 09:01:41 +0000
@@ -406,9 +406,6 @@ For a description of MySQL see the base 
 # Be strict about variables, bail at earliest opportunity, etc.
 set -eu
 
-# Get rid of stuff for ULN RPMs - not needed here
-rm -fr %{src_dir}/SPECIFIC-ULN/
-
 # Optional package files
 touch optional-files-devel
 

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-5.5 branch (joerg.bruehe:3870 to 3871) Joerg Bruehe12 Jun