[IMPROVE] MODVERSIONS kernel option support

Add KBUILD_EXTRA_SYMBOLS
to all Kbuilds and change modules build order.

Change-Id: Iff7ccdf0752bfc563d3708e46a27fa967c1b5679
Signed-off-by: Anastasia Lyupa <a.lyupa@samsung.com>

diff --git a/build.sh b/build.sh
index d66f0db..4a5c400 100755 (executable)
--- a/build.sh
+++ b/build.sh
@@ -21,8 +21,8 @@ else
 fi
 
 buffer_dir=${modules_dir}/buffer
-writer_dir=${modules_dir}/writer
 driver_dir=${modules_dir}/driver
+writer_dir=${modules_dir}/writer
 kprobe_dir=${modules_dir}/kprobe
 kprobe_arch_dir=${kprobe_dir}/arch
 ksyms_dir=${modules_dir}/ksyms
@@ -32,8 +32,8 @@ uprobe_arch_dir=${uprobe_dir}/arch
 us_manager_dir=${modules_dir}/us_manager
 ks_features_dir=${modules_dir}/ks_features
 sampler_dir=${modules_dir}/sampler
-parser_dir=${modules_dir}/parser
 energy_dir=${modules_dir}/energy
+parser_dir=${modules_dir}/parser
 
 install_dir="/opt/swap/sdk"
 
@@ -46,15 +46,15 @@ buffer_module_name=swap_buffer.ko
 buffer_inc=${modules_inc}
 make CROSS_COMPILE=${cross_compile} ARCH=${arch} -C ${kernel_dir} M=${buffer_dir} modules || exit 1
 
+driver_module_name=swap_driver.ko
+make CROSS_COMPILE=${cross_compile} ARCH=${arch} -C ${kernel_dir} M=${driver_dir} \
+       extra_cflags="-I${modules_dir}" modules || exit 1
+
 writer_module_name=swap_writer.ko
 writer_inc=${modules_inc}
 make CROSS_COMPILE=${cross_compile} ARCH=${arch} -C ${kernel_dir} M=${writer_dir} \
        extra_cflags="-Werror -I${modules_dir}" modules || exit 1
 
-driver_module_name=swap_driver.ko
-make CROSS_COMPILE=${cross_compile} ARCH=${arch} -C ${kernel_dir} M=${driver_dir} \
-       extra_cflags="-I${modules_dir}" modules || exit 1
-
 kprobe_module_name=swap_kprobe.ko
 make CROSS_COMPILE=${cross_compile} ARCH=${arch} -C ${kernel_dir} M=${kprobe_dir} \
        extra_cflags="-Werror -I${modules_dir} -I${kprobe_dir} -I${kprobe_arch_dir} -I${ksyms_dir}" \
@@ -84,26 +84,26 @@ sampler_module_name=swap_sampler.ko
 make CROSS_COMPILE=${cross_compile} ARCH=${arch} -C ${kernel_dir} M=${sampler_dir} \
        extra_cflags="-I${modules_dir}" modules || exit 1
 
-parser_module_name=swap_message_parser.ko
-make CROSS_COMPILE=${cross_compile} ARCH=${arch} -C ${kernel_dir} M=${parser_dir} \
-       extra_cflags="-Werror -I${modules_dir}" modules || exit 1
-
 energy_module_name=swap_energy.ko
 make CROSS_COMPILE=${cross_compile} ARCH=${arch} -C ${kernel_dir} M=${energy_dir} \
        extra_cflags="-Werror -I${modules_dir} -I${kprobe_dir} -I${kprobe_arch_dir}" modules || exit 1
 
+parser_module_name=swap_message_parser.ko
+make CROSS_COMPILE=${cross_compile} ARCH=${arch} -C ${kernel_dir} M=${parser_dir} \
+       extra_cflags="-Werror -I${modules_dir}" modules || exit 1
+
 modules=\
 "${buffer_dir}/${buffer_module_name} \
-${writer_dir}/${writer_module_name} \
 ${driver_dir}/${driver_module_name} \
+${writer_dir}/${writer_module_name} \
 ${kprobe_dir}/${kprobe_module_name} \
 ${ks_manager_dir}/${ks_manager_module_name} \
 ${uprobe_dir}/${uprobe_module_name} \
 ${us_manager_dir}/${us_manager_module_name} \
 ${ks_features_dir}/${ks_features_module_name} \
 ${sampler_dir}/${sampler_module_name} \
-${parser_dir}/${parser_module_name} \
-${energy_dir}/${energy_module_name}"
+${energy_dir}/${energy_module_name} \
+${parser_dir}/${parser_module_name}"
 
 # for m in ${modules} ; do
 #      sdb -e push $m ${install_dir}

diff --git a/driver/Kbuild b/driver/Kbuild
index ccd3071..bc4a023 100644 (file)
--- a/driver/Kbuild
+++ b/driver/Kbuild
@@ -1,4 +1,5 @@
 EXTRA_CFLAGS := $(extra_cflags)
+KBUILD_EXTRA_SYMBOLS = $(src)/../buffer/Module.symvers
 
 obj-m := swap_driver.o
 swap_driver-y := swap_driver_module.o \

diff --git a/energy/Kbuild b/energy/Kbuild
index a10d1a9..b59abb3 100644 (file)
--- a/energy/Kbuild
+++ b/energy/Kbuild
@@ -1,4 +1,7 @@
 EXTRA_CFLAGS := $(extra_cflags)
+KBUILD_EXTRA_SYMBOLS = $(src)/../kprobe/Module.symvers \
+                       $(src)/../us_manager/Module.symvers \
+                       $(src)/../driver/Module.symvers
 
 obj-m := swap_energy.o
 swap_energy-y := energy_module.o \

diff --git a/ks_features/Kbuild b/ks_features/Kbuild
index 52cc22e..4cf3445 100644 (file)
--- a/ks_features/Kbuild
+++ b/ks_features/Kbuild
@@ -1,4 +1,6 @@
 EXTRA_CFLAGS := $(extra_cflags)
+KBUILD_EXTRA_SYMBOLS = $(src)/../kprobe/Module.symvers \
+                       $(src)/../writer/Module.symvers
 
 obj-m := swap_ks_features.o
 swap_ks_features-y := ks_features.o

diff --git a/ks_manager/Kbuild b/ks_manager/Kbuild
index ebf8933..220e7c2 100644 (file)
--- a/ks_manager/Kbuild
+++ b/ks_manager/Kbuild
@@ -1,4 +1,5 @@
 EXTRA_CFLAGS := $(extra_cflags)
+KBUILD_EXTRA_SYMBOLS = $(src)/../kprobe/Module.symvers
 
 obj-m := swap_ks_manager.o
 swap_ks_manager-y := ks_manager.o

diff --git a/parser/Kbuild b/parser/Kbuild
index 1c1f36b..7ef0288 100644 (file)
--- a/parser/Kbuild
+++ b/parser/Kbuild
@@ -1,4 +1,10 @@
 EXTRA_CFLAGS := $(extra_cflags)
+KBUILD_EXTRA_SYMBOLS = $(src)/../energy/Module.symvers \
+                       $(src)/../ks_features/Module.symvers \
+                       $(src)/../driver/Module.symvers \
+                       $(src)/../writer/Module.symvers \
+                       $(src)/../us_manager/Module.symvers \
+                       $(src)/../sampler/Module.symvers
 
 obj-m := swap_message_parser.o
 swap_message_parser-y := swap_msg_parser.o \

diff --git a/sampler/Kbuild b/sampler/Kbuild
index 2200ea9..f540563 100644 (file)
--- a/sampler/Kbuild
+++ b/sampler/Kbuild
@@ -1,4 +1,5 @@
 EXTRA_CFLAGS := $(extra_cflags)
+KBUILD_EXTRA_SYMBOLS = $(src)/../writer/Module.symvers
 
 obj-m := swap_sampler.o
 swap_sampler-y := swap_sampler_module.o

diff --git a/uprobe/Kbuild b/uprobe/Kbuild
index b2d8306..518445c 100644 (file)
--- a/uprobe/Kbuild
+++ b/uprobe/Kbuild
@@ -1,5 +1,6 @@
 EXTRA_CFLAGS := $(extra_cflags)
+KBUILD_EXTRA_SYMBOLS = $(src)/../kprobe/Module.symvers
 
 obj-m := swap_uprobe.o
 swap_uprobe-y := swap_uprobes.o arch/asm/swap_uprobes.o
-swap_uprobe-$(CONFIG_ARM) += arch/asm/trampoline_thumb.o
\ No newline at end of file
+swap_uprobe-$(CONFIG_ARM) += arch/asm/trampoline_thumb.o

diff --git a/us_manager/Kbuild b/us_manager/Kbuild
index baae767..3019f30 100644 (file)
--- a/us_manager/Kbuild
+++ b/us_manager/Kbuild
@@ -1,4 +1,7 @@
 EXTRA_CFLAGS := $(extra_cflags)
+KBUILD_EXTRA_SYMBOLS = $(src)/../writer/Module.symvers \
+                       $(src)/../kprobe/Module.symvers \
+                       $(src)/../uprobe/Module.symvers
 
 obj-m := swap_us_manager.o
 swap_us_manager-y := us_manager.o us_slot_manager.o helper.o \

diff --git a/writer/Kbuild b/writer/Kbuild
index 8f15bde..e09374a 100644 (file)
--- a/writer/Kbuild
+++ b/writer/Kbuild
@@ -1,4 +1,6 @@
 EXTRA_CFLAGS := $(extra_cflags)
+KBUILD_EXTRA_SYMBOLS = $(src)/../buffer/Module.symvers \
+                       $(src)/../driver/Module.symvers
 
 obj-m := swap_writer.o
 swap_writer-y := swap_writer_module.o \