Merge pull request #176 from minextu/improvements3

Improvements 3

build.sh

@@ -187,6 +187,23 @@ generate_package_files() {
 
 build_packages() {
     for pkg in "${pkg_list[@]}"; do
+
+        # get version of any package that has been build previously
+        run_cmd_show_and_capture_output "ls \"${script_dir}/packages/${kernel_name}/${pkg}/\"${pkg}*.pkg.tar.xz | grep \"$pkg\" | grep -v \"headers\" | tail -1"
+        pkg_path=${run_cmd_output}
+        vers=$(package_version_from_path ${pkg_path})
+        
+        # get current version
+        eval $(source "${script_dir}/packages/${kernel_name}/${pkg}/PKGBUILD";
+            echo current_vers="${pkgver}";
+            echo current_rel="${pkgrel}";
+        )
+        # stop if version has already been build
+        if [[ ${run_cmd_return} -eq 0 && ${vers} = ${current_vers}-${current_rel} ]]; then
+            msg "${pkg}=${vers} has already been build, skipping"
+            continue
+        fi
+
         msg "Building ${pkg}..."
         run_cmd "cd \"${script_dir}/packages/${kernel_name}/${pkg}\" && ccm64 s && mksrcinfo"
         if [[ ${run_cmd_return} -ne 0 ]]; then

conf.sh

@@ -5,7 +5,7 @@ zol_version="0.7.1"
 zfs_src_hash="231b104979ddacfeb1889e1dec175337276e7b3b109d40656089744b5caf3ef6"
 spl_src_hash="e6a83dc50bc83a5ce6f20238da16fb941ab6090c419be8af8fc9223210f637fd"
 zfs_bash_completion_hash="b60214f70ffffb62ffe489cbfabd2e069d14ed2a391fac0e36f914238394b540"
-zfs_initcpio_install_hash="aa5706bf08b36209a318762680f3c9fb45b3fc4b8e4ef184c8a5370b2c3000ca"
+zfs_initcpio_install_hash="e33adabbe3f2f4866802c9d63c7810c7a42b4df2288d0cdd23376519b15b36e4"
 zfs_initcpio_hook_hash="2bb533db561992c861bb9acad64a127f81cf0e4bf39cb4308ac7a73a17db55a7"
 
 # Notification address

push.sh

@@ -97,8 +97,17 @@ push_packages() {
         debug "PWD=${PWD}"
         local cmd="cd \"${script_dir}/packages/${kernel_name}/${pkg}\" && "
         if [[ ${push} -eq 1 ]]; then
+            
+            if [[ ! -z ${kernel_version_full} ]]; then
+                vers=$(kernel_version_full_no_hyphen ${kernel_version_full})-${zfs_pkgrel}
+            elif [[ ! -z ${zfs_pkgver} ]]; then
+                vers=$zfs_pkgver
+            else
+                vers="latest git commit"
+            fi
+            
             cmd+="git --no-pager diff && echo && echo && git checkout master && git add . && "
-            cmd+="git commit -m 'Semi-automated update for $(kernel_version_full_no_hyphen ${kernel_version_full})-${zfs_pkgrel}'; git push"
+            cmd+="git commit -m 'Semi-automated update for $vers'; git push"
         else
             cmd+="git --no-pager diff"
         fi

src/kernels/linux-zen.sh

@@ -44,12 +44,10 @@ update_linux_pkgbuilds() {
     spl_pkgrel=${pkgrel}
     zfs_pkgrel=${pkgrel}
     spl_conflicts="'spl-linux-zen-git'"
-    spl_headers_conflicts="'spl-linux-zen-git-headers' 'spl-linux-headers' 'spl-linux-git-headers' 'spl-linux-lts-headers' 'spl-linux-lts-git-headers' 'spl-linux-hardened-headers' 'spl-linux-hardened-git-headers'"
-    zfs_headers_conflicts="'zfs-linux-zen-git-headers' 'zfs-linux-headers' 'zfs-linux-git-headers' 'zfs-linux-lts-headers' 'zfs-linux-lts-git-headers' 'zfs-linux-hardened-headers' 'zfs-linux-hardened-git-headers'"
     zfs_conflicts="'zfs-linux-zen-git'"
-    spl_utils_pkgname="spl-utils-common"
+    spl_utils_pkgname="spl-utils-common>=${zol_version}"
     spl_pkgname="spl-linux-zen"
-    zfs_utils_pkgname="zfs-utils-common"
+    zfs_utils_pkgname="zfs-utils-common>=${zol_version}"
     zfs_pkgname="zfs-linux-zen"
     # Paths are relative to build.sh
     spl_pkgbuild_path="packages/${kernel_name}/${spl_pkgname}"
@@ -66,9 +64,9 @@ update_linux_pkgbuilds() {
 update_linux_git_pkgbuilds() {
     pkg_list=("spl-linux-zen-git" "zfs-linux-zen-git")
     kernel_version=${kernel_version_git}
-    kernel_version_full=$(kernel_version_full ${kernel_version_git})
+    kernel_version_full=$(kernel_version_full ${kernel_version})
-    kernel_version_full_pkgver=$(kernel_version_full_no_hyphen ${kernel_version_git})
+    kernel_version_full_pkgver=$(kernel_version_full_no_hyphen ${kernel_version})
-    kernel_version_major=${kernel_version_git%-*}
+    kernel_version_major=${kernel_version%-*}
     kernel_mod_path="${kernel_version_full}-zen"
     archzfs_package_group="archzfs-linux-zen-git"
     spl_pkgver="" # Set later by call to git_calc_pkgver
@@ -76,12 +74,8 @@ update_linux_git_pkgbuilds() {
     spl_pkgrel=${pkgrel_git}
     zfs_pkgrel=${pkgrel_git}
     spl_conflicts="'spl-linux-zen'"
-    spl_headers_conflicts="'spl-linux-zen-headers' 'spl-linux-headers' 'spl-linux-git-headers' 'spl-linux-lts-headers' 'spl-linux-lts-git-headers' 'spl-linux-hardened-headers' 'spl-linux-hardened-git-headers'"
-    zfs_headers_conflicts="'zfs-linux-zen-headers' 'zfs-linux-headers' 'zfs-linux-git-headers' 'zfs-linux-lts-headers' 'zfs-linux-lts-git-headers' 'zfs-linux-hardened-headers' 'zfs-linux-hardened-git-headers'"
     zfs_conflicts="'zfs-linux-zen'"
-    spl_utils_pkgname="spl-utils-common-git"
     spl_pkgname="spl-linux-zen-git"
-    zfs_utils_pkgname="zfs-utils-common-git"
     zfs_pkgname="zfs-linux-zen-git"
     spl_pkgbuild_path="packages/${kernel_name}/${spl_pkgname}"
     zfs_pkgbuild_path="packages/${kernel_name}/${zfs_pkgname}"
@@ -105,4 +99,6 @@ update_linux_git_pkgbuilds() {
         git_check_repo
         git_calc_pkgver
     fi
+    spl_utils_pkgname="spl-utils-common-git>=${spl_git_ver}"
+    zfs_utils_pkgname="zfs-utils-common-git>=${zfs_git_ver}"
 }