More kernel header cleanup.
Modify the generate script to add a new option and copy the types.h
arm header file since it's not currently being created properly. Also
manually generate the arm types.h uapi header since it's not being
properly generated right now.
Modify both generate scripts to delete the target directories before
adding the files to handle moved/deleted header files.
Move the common/scsi headers into android and delete the common
directory. Change the scripts to reflect this change.
Update the scsi headers since they've been modified in upstream kernels.
Bug: 30072483
Change-Id: Ia43d4b238b6a041350d60cc30184ecbd4829d7d5
diff --git a/libc/kernel/tools/generate_uapi_headers.sh b/libc/kernel/tools/generate_uapi_headers.sh
index 3c80d9f..4603fbe 100755
--- a/libc/kernel/tools/generate_uapi_headers.sh
+++ b/libc/kernel/tools/generate_uapi_headers.sh
@@ -30,6 +30,9 @@
### --use-kernel-dir <DIR>
### Do not check out the kernel source, use the kernel directory
### pointed to by <DIR>.
+### --verify-modified-headers-only <DIR>
+### Do not build anything, simply verify that the set of modified
+### kernel headers have not changed.
# Terminate the script if any command fails.
set -eE
@@ -42,6 +45,7 @@
ARCH_LIST=("arm" "arm64" "mips" "x86")
ANDROID_KERNEL_DIR="external/kernel-headers/original"
SKIP_GENERATION=0
+VERIFY_HEADERS_ONLY=0
function cleanup () {
if [[ "${TMPDIR}" =~ /tmp ]] && [[ -d "${TMPDIR}" ]]; then
@@ -99,7 +103,7 @@
done
}
-function check_hdrs () {
+function verify_modified_hdrs () {
local src_dir=$1
local tgt_dir=$2
local kernel_dir=$3
@@ -124,7 +128,7 @@
done
for dir in "${search_dirs[@]}"; do
- check_hdrs "${dir}" ${tgt_dir}/$(basename ${dir}) "${kernel_dir}"
+ verify_modified_hdrs "${dir}" ${tgt_dir}/$(basename ${dir}) "${kernel_dir}"
done
}
@@ -149,6 +153,16 @@
KERNEL_DIR="$1"
KERNEL_DOWNLOAD=0
;;
+ "--verify-modified-headers-only")
+ if [[ $# -lt 2 ]]; then
+ echo "--verify-modified-headers-only requires an argument."
+ exit 1
+ fi
+ shift
+ KERNEL_DIR="$1"
+ KERNEL_DOWNLOAD=0
+ VERIFY_HEADERS_ONLY=1
+ ;;
"-h" | "--help")
usage
exit 1
@@ -183,6 +197,14 @@
src_dir="common"
fi
+if [[ ${VERIFY_HEADERS_ONLY} -eq 1 ]]; then
+ # Verify if modified headers have changed.
+ verify_modified_hdrs "${KERNEL_DIR}/${src_dir}/include/scsi" \
+ "${ANDROID_KERNEL_DIR}/scsi" \
+ "${KERNEL_DIR}/${src_dir}"
+ exit 0
+fi
+
if [[ ${KERNEL_DOWNLOAD} -eq 1 ]]; then
TMPDIR=$(mktemp -d /tmp/android_kernelXXXXXXXX)
cd "${TMPDIR}"
@@ -202,6 +224,9 @@
fi
if [[ ${SKIP_GENERATION} -eq 0 ]]; then
+ # Clean up any leftover headers.
+ make distclean
+
# Build all of the generated headers.
for arch in "${ARCH_LIST[@]}"; do
echo "Generating headers for arch ${arch}"
@@ -209,6 +234,11 @@
done
fi
+# Completely delete the old original headers so that any deleted/moved
+# headers are also removed.
+rm -rf "${ANDROID_KERNEL_DIR}/uapi"
+mkdir -p "${ANDROID_KERNEL_DIR}/uapi"
+
cd ${ANDROID_BUILD_TOP}
# Copy all of the include/uapi files to the kernel headers uapi directory.
@@ -237,7 +267,12 @@
"${ANDROID_KERNEL_DIR}/uapi/asm-${arch}/asm"
done
+# The arm types.h uapi header is not properly being generated, so copy it
+# directly.
+cp "${KERNEL_DIR}/${src_dir}/include/uapi/asm-generic/types.h" \
+ "${ANDROID_KERNEL_DIR}/uapi/asm-arm/asm"
+
# Verify if modified headers have changed.
-check_hdrs "${KERNEL_DIR}/${src_dir}/include/scsi" \
- "${ANDROID_KERNEL_DIR}/scsi" \
- "${KERNEL_DIR}/${src_dir}"
+verify_modified_hdrs "${KERNEL_DIR}/${src_dir}/include/scsi" \
+ "${ANDROID_KERNEL_DIR}/scsi" \
+ "${KERNEL_DIR}/${src_dir}"