diff options
| author | Amit Pundir <amit.pundir@linaro.org> | 2015-12-09 20:54:41 +0530 |
|---|---|---|
| committer | Amit Pundir <amit.pundir@linaro.org> | 2015-12-09 20:54:41 +0530 |
| commit | df86aeb236c68b66939da25e27ba2d76c810de89 (patch) | |
| tree | 1435e8a9197feae2572ac192ef74b2fe813a7129 /scripts | |
| parent | 6844488aaa6b23d45106c9c3c3ba2f2ee4a612f9 (diff) | |
| parent | b8f1ef571f89e753d861f87150feb75f5be61bc4 (diff) | |
Merge branch 'android-4.1' of https://android.googlesource.com/kernel/common
* android-4.1: (481 commits)
net: pppopns: pppolac: fix sendmsg function calls
UPSTREAM: HID: hid-input: allow input_configured callback return errors
Revert "HID: Add input_register callback."
mmc: Extend wakelock if bus is dead
Revert "mmc: mmcblk: Add support for deferred SD bus resume"
Revert "mmc: block: Remove call to mmc_blk_set_blksize"
fiq_debugger: Build fixes for 4.1
trace: cpufreq: Add tracing for min/max cpufreq
tracing/sched: Add trace events to track cpu hotplug.
of: Fix build warnings
android: configs: base: enable configfs gadget functions
android: add CONFIG_DEBUG_RODATA to recommended config
android: configs: remove CONFIG_BATTERY_ANDROID=y
android: configs: base: enable IPV6
android: configs: Enable SELinux and its dependencies.
android: base-cfg: disable ALARM_DEV
android: base-cfg: turn off /dev/mem and /dev/kmem
android: base-cfg: enable ARMV8_DEPRECATED and subfeatures
android: base-cfg: enforce the needed XFRM_MODE_TUNNEL (for VPN)
android: base-cfg: disable LOGGER
...
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/Makefile.lib | 6 | ||||
| -rw-r--r-- | scripts/Makefile.modinst | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index 79e86613712f..c84080885ad4 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -294,6 +294,12 @@ $(obj)/%.dtb: $(src)/%.dts FORCE dtc-tmp = $(subst $(comma),_,$(dot-target).dts.tmp) +# cat +# --------------------------------------------------------------------------- +# Concatentate multiple files together +quiet_cmd_cat = CAT $@ +cmd_cat = (cat $(filter-out FORCE,$^) > $@) || (rm -f $@; false) + # Bzip2 # --------------------------------------------------------------------------- diff --git a/scripts/Makefile.modinst b/scripts/Makefile.modinst index e48a4e9d8868..9b7b2804e50d 100644 --- a/scripts/Makefile.modinst +++ b/scripts/Makefile.modinst @@ -29,7 +29,7 @@ quiet_cmd_modules_install = INSTALL $@ INSTALL_MOD_DIR ?= extra ext-mod-dir = $(INSTALL_MOD_DIR)$(subst $(patsubst %/,%,$(KBUILD_EXTMOD)),,$(@D)) -modinst_dir = $(if $(KBUILD_EXTMOD),$(ext-mod-dir),kernel/$(@D)) +modinst_dir ?= $(if $(KBUILD_EXTMOD),$(ext-mod-dir),kernel/$(@D)) $(modules): $(call cmd,modules_install,$(MODLIB)/$(modinst_dir)) |