diff options
| -rw-r--r-- | remote/modules/kernel/kernel.build | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/remote/modules/kernel/kernel.build b/remote/modules/kernel/kernel.build index 32d5368b..79338fab 100644 --- a/remote/modules/kernel/kernel.build +++ b/remote/modules/kernel/kernel.build @@ -107,25 +107,19 @@ patch_aufs() { git checkout "origin/aufs$NEEDED_BRANCH" || perror "Could not checkout needed branch." pinfo "Starting to patch... $NEEDED_BRANCH" tarcopy "Documentation fs" "$MODULE_DIR/ksrc" - local AUFSH - if [ ! -e "include/linux/aufs_type.h" ]; then - [ ! -e "include/uapi/linux/aufs_type.h" ] && perror "No aufs_type.h in aufs3-git" - AUFSH="include/uapi/linux/aufs_type.h" - elif [ -e "include/uapi/linux/aufs_type.h" -a "$(stat -c %s "include/uapi/linux/aufs_type.h")" -gt "$(stat -c %s "include/linux/aufs_type.h")" ]; then - AUFSH="include/uapi/linux/aufs_type.h" - else - AUFSH="include/linux/aufs_type.h" - fi - pinfo "Using $AUFSH" -# cp "$AUFSH" "$MODULE_DIR/ksrc/include/uapi/linux/" || perror "could not copy $AUFSH" - cp "$AUFSH" "$MODULE_DIR/ksrc/include/linux/" || perror "could not copy $AUFSH" + # Quick-and-dirty aufs_type.h copying: + [ -e "include/linux/aufs_type.h" ] && cp "include/linux/aufs_type.h" "$MODULE_DIR/ksrc/include/linux/" + [ -e "include/uapi/linux/aufs_type.h" ] && cp "include/uapi/linux/aufs_type.h" "$MODULE_DIR/ksrc/include/uapi/linux/" + cd "$MODULE_DIR/ksrc" || perror "Could not CD to kernel-source dir ksrc" patch -p1 < "$MODULE_DIR/aufs3-standalone/aufs3-kbuild.patch" || perror "aufs3-standalone/aufs3-kbuild.patch failed!" patch -p1 < "$MODULE_DIR/aufs3-standalone/aufs3-base.patch" || perror "aufs3-standalone/aufs3-base.patch failed!" + + # this following 'if' is a burning shame - caused as patching under eg. openSuse 13.1 is always unsuccessful due to hunk failing if [ -f "$MODULE_DIR/aufs3-standalone/aufs3-mmap.patch" ]; then - patch -p1 < "$MODULE_DIR/aufs3-standalone/aufs3-mmap.patch" || pinfo "Problem patching aufs3-mmap.patch: hunks failed?" + patch -p1 < "$MODULE_DIR/aufs3-standalone/aufs3-mmap.patch" || pwarning "Problem patching aufs3-mmap.patch: hunks failed?" fi pinfo "Patched kernel source with aufs-${NEEDED_BRANCH}" cd "$MODULE_DIR" |