← Back to branch summary

~ubuntu-branches/ubuntu/utopic/android/utopic

« back to all changes in this revision

Viewing changes to debian/patches/use_local_kernel.diff

  • Committer: Package Import Robot
  • Author(s): Dmitrijs Ledkovs
  • Date: 2013-07-22 14:58:47 UTC
  • Revision ID: package-import@ubuntu.com-20130722145847-zweelwgbhbc29bil
Tags: 0.20130722-0ubuntu8
Use proper copyrights.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/use_local_kernel.diff
 
1
--- a/build/core/tasks/kernel.mk
 
2
+++ b/build/core/tasks/kernel.mk
 
3
@@ -146,6 +146,7 @@
 
4
 
 
5
 .PHONY: $(TARGET_OUT_UBUNTU_KERNEL)/vmlinuz
 
6
 $(TARGET_OUT_UBUNTU_KERNEL)/vmlinuz: $(TARGET_OUT_UBUNTU_KERNEL) $(KERNEL_HEADERS_INSTALL)
 
7
+ifeq (,$(wildcard $(OUT_DIR)/../repo/$(TARGET_KERNEL_UBUNTU_SERIES)/linux-image-*-$(TARGET_DEVICE)*.deb))
 
8
        $(hide) $(PULL_LP_BIN) $(TARGET_KERNEL_UBUNTU_META) -o $(TARGET_OUT_UBUNTU_KERNEL) $(TARGET_KERNEL_UBUNTU_SERIES)
 
9
        $(hide) IFS=", "; for dep in \
 
10
                `dpkg-deb -f $(TARGET_OUT_UBUNTU_KERNEL)/$(TARGET_KERNEL_UBUNTU_META)_*.deb Depends`; do \
 
11
@@ -155,16 +156,19 @@
 
12
                done; \
 
13
                if [ -n "$$kernel_image" ]; then \
 
14
                        $(PULL_LP_BIN) $$kernel_image -o $(TARGET_OUT_UBUNTU_KERNEL) $(TARGET_KERNEL_UBUNTU_SERIES); \
 
15
-                       dpkg-deb -x $(TARGET_OUT_UBUNTU_KERNEL)/linux-image-[0-9]*.deb $(TARGET_OUT_UBUNTU_KERNEL); \
 
16
-                       kernel_version=$${kernel_image#linux-image-}; \
 
17
-                       cp -v $(TARGET_OUT_UBUNTU_KERNEL)/boot/vmlinuz-$$kernel_version $(TARGET_OUT_UBUNTU_KERNEL)/vmlinuz; \
 
18
-                       cp -a $(TARGET_OUT_UBUNTU_KERNEL)/lib/modules/$$kernel_version $(KERNEL_MODULES_OUT); \
 
19
-                       depmod -a -b $(TARGET_OUT) $$kernel_version; \
 
20
                else \
 
21
                        echo -n "Unable to find a valid linux-image dependency from "; \
 
22
                        echo "the meta package $(TARGET_KERNEL_UBUNTU_META), aborting."; \
 
23
                        exit 1; \
 
24
                fi;
 
25
+else
 
26
+       $(hide) cp $(OUT_DIR)/../repo/$(TARGET_KERNEL_UBUNTU_SERIES)/linux-image-*-$(TARGET_DEVICE)*.deb $(TARGET_OUT_UBUNTU_KERNEL)
 
27
+endif
 
28
+       $(hide) dpkg-deb -x $(TARGET_OUT_UBUNTU_KERNEL)/linux-image-[0-9]*.deb $(TARGET_OUT_UBUNTU_KERNEL); \
 
29
+       kernel_version=`dpkg-deb -I $(TARGET_OUT_UBUNTU_KERNEL)/linux-image-[0-9]*.deb | sed -n 's/ Package: linux-image-//p'`; \
 
30
+       cp -v $(TARGET_OUT_UBUNTU_KERNEL)/boot/vmlinuz-$$kernel_version $(TARGET_OUT_UBUNTU_KERNEL)/vmlinuz; \
 
31
+       cp -a $(TARGET_OUT_UBUNTU_KERNEL)/lib/modules/$$kernel_version $(KERNEL_MODULES_OUT); \
 
32
+       depmod -a -b $(TARGET_OUT) $$kernel_version
 
33
 
 
34
 else ifeq ($(FULL_KERNEL_BUILD),true)
 
35
 
 
36
--- a/build/core/Makefile
 
37
+++ b/build/core/Makefile
 
38
@@ -403,7 +403,11 @@
 
39
        $(call pretty,"Target Ubuntu Touch ram disk: $@")
 
40
        $(hide) rm -rf $(TARGET_OUT_UBUNTU_INITRD)
 
41
        $(hide) mkdir -p $(TARGET_OUT_UBUNTU_INITRD)
 
42
+ifeq (,$(wildcard $(OUT_DIR)/../repo/$(TARGET_KERNEL_UBUNTU_SERIES)/$(TARGET_UBUNTU_INITRD_PKG)*deb))
 
43
        $(hide) $(PULL_LP_BIN) $(TARGET_UBUNTU_INITRD_PKG) -o $(TARGET_OUT_UBUNTU_INITRD)
 
44
+else
 
45
+       $(hide) $(ACP) $(wildcard $(OUT_DIR)/../repo/$(TARGET_KERNEL_UBUNTU_SERIES)/$(TARGET_UBUNTU_INITRD_PKG)*deb) $(TARGET_OUT_UBUNTU_INITRD)
 
46
+endif
 
47
        $(hide) dpkg-deb -x $(TARGET_OUT_UBUNTU_INITRD)/$(TARGET_UBUNTU_INITRD_PKG)*.deb $(TARGET_OUT_UBUNTU_INITRD)
 
48
        $(hide) $(ACP) $(TARGET_UBUNTU_INITRD) $@
 
49