diff -Nru linux-linaro-origen-3.7-3.7.0/debian/changelog linux-linaro-origen-3.7-3.7.0/debian/changelog diff -Nru linux-linaro-origen-3.7-3.7.0/debian/control linux-linaro-origen-3.7-3.7.0/debian/control --- linux-linaro-origen-3.7-3.7.0/debian/control 2013-01-18 09:15:21.000000000 +0000 +++ linux-linaro-origen-3.7-3.7.0/debian/control 2013-01-23 16:46:14.000000000 +0000 @@ -3,7 +3,7 @@ Priority: optional Maintainer: Ubuntu Kernel Team Standards-Version: 3.8.4.0 -Build-Depends: debhelper (>= 5), cpio, module-init-tools, kernel-wedge (>= 2.24ubuntu1), makedumpfile [amd64 i386], libelf-dev, libnewt-dev, binutils-dev, rsync, libdw-dev, dpkg (>= 1.16.0~ubuntu4), util-linux, pkg-config, flex, bison, libunwind8-dev, libaudit-dev [amd64 i386] +Build-Depends: debhelper (>= 5), cpio, module-init-tools, kernel-wedge (>= 2.24ubuntu1), makedumpfile [amd64 i386], libelf-dev, libnewt-dev, binutils-dev, rsync, libdw-dev, dpkg (>= 1.16.0~ubuntu4), util-linux, pkg-config, flex, bison, libunwind8-dev, libaudit-dev [amd64 i386 armhf] Build-Depends-Indep: xmlto, docbook-utils, ghostscript, transfig, bzip2, sharutils, asciidoc Build-Conflicts: findutils (= 4.4.1-1ubuntu1) Vcs-Git: git://github.com/jcrigby/linaro-ci-kernels.git linux-linaro-origen-3.7_3.7.0-1.1--ci+121219092136 diff -Nru linux-linaro-origen-3.7-3.7.0/debian/control.stub linux-linaro-origen-3.7-3.7.0/debian/control.stub --- linux-linaro-origen-3.7-3.7.0/debian/control.stub 2013-01-18 09:15:21.000000000 +0000 +++ linux-linaro-origen-3.7-3.7.0/debian/control.stub 2013-01-23 16:46:14.000000000 +0000 @@ -3,7 +3,7 @@ Priority: optional Maintainer: Ubuntu Kernel Team Standards-Version: 3.8.4.0 -Build-Depends: debhelper (>= 5), cpio, module-init-tools, kernel-wedge (>= 2.24ubuntu1), makedumpfile [amd64 i386], libelf-dev, libnewt-dev, binutils-dev, rsync, libdw-dev, dpkg (>= 1.16.0~ubuntu4), util-linux, pkg-config, flex, bison, libunwind8-dev, libaudit-dev [amd64 i386] +Build-Depends: debhelper (>= 5), cpio, module-init-tools, kernel-wedge (>= 2.24ubuntu1), makedumpfile [amd64 i386], libelf-dev, libnewt-dev, binutils-dev, rsync, libdw-dev, dpkg (>= 1.16.0~ubuntu4), util-linux, pkg-config, flex, bison, libunwind8-dev, libaudit-dev [amd64 i386 armhf] Build-Depends-Indep: xmlto, docbook-utils, ghostscript, transfig, bzip2, sharutils, asciidoc Build-Conflicts: findutils (= 4.4.1-1ubuntu1) Vcs-Git: git://github.com/jcrigby/linaro-ci-kernels.git linux-linaro-origen-3.7_3.7.0-1.1--ci+121219092136 diff -Nru linux-linaro-origen-3.7-3.7.0/debian/rules linux-linaro-origen-3.7-3.7.0/debian/rules --- linux-linaro-origen-3.7-3.7.0/debian/rules 2013-01-18 09:14:23.000000000 +0000 +++ linux-linaro-origen-3.7-3.7.0/debian/rules 2013-01-23 16:44:36.000000000 +0000 @@ -226,15 +226,15 @@ done; \ fi - if [ ! -d $(builddir)/modules/$(build_arch) ]; then \ - mkdir -p $(builddir)/modules/$(build_arch); \ + if [ ! -d $(builddir)/modules/$(kernel_arch) ]; then \ + mkdir -p $(builddir)/modules/$(kernel_arch); \ cp $(builddir)/modules/$(arch)/* \ - $(builddir)/modules/$(build_arch) || true; \ + $(builddir)/modules/$(kernel_arch) || true; \ fi - if [ ! -d $(builddir)/firmware/$(build_arch) ]; then \ - mkdir -p $(builddir)/firmware/$(build_arch); \ + if [ ! -d $(builddir)/firmware/$(kernel_arch) ]; then \ + mkdir -p $(builddir)/firmware/$(kernel_arch); \ cp $(builddir)/firmware/$(arch)/* \ - $(builddir)/firmware/$(build_arch) || true; \ + $(builddir)/firmware/$(kernel_arch) || true; \ fi cp $(DEBIAN)/control.stub debian/control.stub diff -Nru linux-linaro-origen-3.7-3.7.0/debian/rules.d/0-common-vars.mk linux-linaro-origen-3.7-3.7.0/debian/rules.d/0-common-vars.mk --- linux-linaro-origen-3.7-3.7.0/debian/rules.d/0-common-vars.mk 2013-01-18 09:14:25.000000000 +0000 +++ linux-linaro-origen-3.7-3.7.0/debian/rules.d/0-common-vars.mk 2013-01-23 16:45:15.000000000 +0000 @@ -109,8 +109,7 @@ # # Detect invocations of the form 'dpkg-buildpackage -B -aarmhf' within -# an x86'en schroot. This is the only way to build all of the packages -# (except for tools). +# an x86'en schroot. This is the correct way to build all of the packages. # ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE)) CROSS_COMPILE ?= $(DEB_HOST_GNU_TYPE)- @@ -217,7 +216,7 @@ conc_level = -j$(CONCURRENCY_LEVEL) # target_flavour is filled in for each step -kmake = make ARCH=$(build_arch) \ +kmake = make ARCH=$(kernel_arch) \ CROSS_COMPILE=$(CROSS_COMPILE) \ KERNELVERSION=$(abi_release)-$(target_flavour) \ CONFIG_DEBUG_SECTION_MISMATCH=y \ diff -Nru linux-linaro-origen-3.7-3.7.0/debian/rules.d/2-binary-arch.mk linux-linaro-origen-3.7-3.7.0/debian/rules.d/2-binary-arch.mk --- linux-linaro-origen-3.7-3.7.0/debian/rules.d/2-binary-arch.mk 2013-01-18 09:14:23.000000000 +0000 +++ linux-linaro-origen-3.7-3.7.0/debian/rules.d/2-binary-arch.mk 2013-01-23 16:45:45.000000000 +0000 @@ -10,6 +10,7 @@ build_O = O=$(builddir)/build-$* endif crossbuildscripts=$(shell grep KBUILD_SCRIPTROOT scripts/Makefile.build && echo "true") +STRIP = $(CROSS_COMPILE)strip kbsr = $(builddir)/build-$* @@ -97,7 +98,7 @@ install -m600 $(builddir)/build-$*/System.map \ $(pkgdir)/boot/System.map-$(abi_release)-$* install -d $(pkgdir)/lib/firmware/$(abi_release)-$*/device-tree; \ - install -m644 $(builddir)/build-$*/arch/$(build_arch)/boot/*.dtb \ + install -m644 $(builddir)/build-$*/arch/$(kernel_arch)/boot/*.dtb \ $(pkgdir)/lib/firmware/$(abi_release)-$*/device-tree/ || \ echo "No dtb files for this platform" > \ $(pkgdir)/lib/firmware/$(abi_release)-$*/device-tree/README @@ -146,7 +147,7 @@ install -d $(pkgdir)/DEBIAN for script in postinst postrm preinst prerm; do \ sed -e 's/=V/$(abi_release)-$*/g' -e 's/=K/$(instfile)/g' \ - -e 's/=L/$(loader)/g' -e 's@=B@$(build_arch)@g' \ + -e 's/=L/$(loader)/g' -e 's@=B@$(kernel_arch)@g' \ $(DROOT)/control-scripts/$$script > $(pkgdir)/DEBIAN/$$script; \ chmod 755 $(pkgdir)/DEBIAN/$$script; \ done @@ -155,7 +156,7 @@ install -d $(pkgdir_ex)/DEBIAN; \ for script in postinst postrm ; do \ sed -e 's/=V/$(abi_release)-$*/g' -e 's/=K/$(instfile)/g' \ - -e 's/=L/$(loader)/g' -e 's@=B@$(build_arch)@g' \ + -e 's/=L/$(loader)/g' -e 's@=B@$(kernel_arch)@g' \ debian/control-scripts/$$script > $(pkgdir_ex)/DEBIAN/$$script; \ chmod 755 $(pkgdir_ex)/DEBIAN/$$script; \ done; \ @@ -181,7 +182,7 @@ sed -e 's/=V/$(abi_release)-$*/g' \ -e 's/=K/$(instfile)/g' \ -e 's/=L/$(loader)/g' \ - -e 's@=B@$(build_arch)@g' \ + -e 's@=B@$(kernel_arch)@g' \ $(DROOT)/control-scripts/$$script > \ debian/$(bin_pkg_name)-$$sub/DEBIAN/$$script;\ chmod 755 debian/$(bin_pkg_name)-$$sub/DEBIAN/$$script;\ @@ -266,7 +267,7 @@ done # At the end of the package prep, call the tests - DPKG_ARCH="$(arch)" KERN_ARCH="$(build_arch)" FLAVOUR="$*" \ + DPKG_ARCH="$(arch)" KERN_ARCH="$(kernel_arch)" FLAVOUR="$*" \ VERSION="$(abi_release)" REVISION="$(revision)" \ PREV_REVISION="$(prev_revision)" ABI_NUM="$(abinum)" \ PREV_ABI_NUM="$(prev_abinum)" BUILD_DIR="$(builddir)/build-$*" \ @@ -464,8 +465,12 @@ $(stampdir)/stamp-build-perarch: $(stampdir)/stamp-prepare-perarch @echo Debug: $@ ifeq ($(do_tools),true) + # we don't have cross-libiberty yet so avoid it by leaving out C++ demangling +ifeq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH)) + features=HAVE_CPLUS_DEMANGLE=1 +endif cd $(builddirpa)/tools/perf && \ - make HAVE_CPLUS_DEMANGLE=1 CROSS_COMPILE=$(CROSS_COMPILE) + make $(features) ARCH=$(header_arch) CROSS_COMPILE=$(CROSS_COMPILE) if [ "$(arch)" = "amd64" ] || [ "$(arch)" = "i386" ]; then \ cd $(builddirpa)/tools/power/x86/x86_energy_perf_policy && make CROSS_COMPILE=$(CROSS_COMPILE); \ cd $(builddirpa)/tools/power/x86/turbostat && make CROSS_COMPILE=$(CROSS_COMPILE); \ @@ -482,16 +487,16 @@ # Add the tools. ifeq ($(do_tools),true) install -d $(toolspkgdir)/usr/bin - install -s -m755 $(builddirpa)/tools/perf/perf \ + install -s --strip-program=$(STRIP) -m755 $(builddirpa)/tools/perf/perf \ $(toolspkgdir)/usr/bin/perf_$(abi_release) if [ "$(arch)" = "amd64" ] || [ "$(arch)" = "i386" ]; then \ - install -s -m755 $(builddirpa)/tools/power/x86/x86_energy_perf_policy/x86_energy_perf_policy \ + install -s --strip-program=$(STRIP) -m755 $(builddirpa)/tools/power/x86/x86_energy_perf_policy/x86_energy_perf_policy \ $(toolspkgdir)/usr/bin/x86_energy_perf_policy_$(abi_release); \ - install -s -m755 $(builddirpa)/tools/power/x86/turbostat/turbostat \ + install -s --strip-program=$(STRIP) -m755 $(builddirpa)/tools/power/x86/turbostat/turbostat \ $(toolspkgdir)/usr/bin/turbostat_$(abi_release); \ if [ "$(do_hyperv)" = "true" ]; then \ install -d $(toolspkgdir)/usr/sbin; \ - install -s -m755 $(builddirpa)/tools/hv/hv_kvp_daemon \ + install -s --strip-program=$(STRIP) -m755 $(builddirpa)/tools/hv/hv_kvp_daemon \ $(toolspkgdir)/usr/sbin/hv_kvp_daemon_$(abi_release); \ fi; \ fi diff -Nru linux-linaro-origen-3.7-3.7.0/debian.linaro/control linux-linaro-origen-3.7-3.7.0/debian.linaro/control --- linux-linaro-origen-3.7-3.7.0/debian.linaro/control 2013-01-18 09:15:23.000000000 +0000 +++ linux-linaro-origen-3.7-3.7.0/debian.linaro/control 2013-01-23 16:46:15.000000000 +0000 @@ -3,7 +3,7 @@ Priority: optional Maintainer: Ubuntu Kernel Team Standards-Version: 3.8.4.0 -Build-Depends: debhelper (>= 5), cpio, module-init-tools, kernel-wedge (>= 2.24ubuntu1), makedumpfile [amd64 i386], libelf-dev, libnewt-dev, binutils-dev, rsync, libdw-dev, dpkg (>= 1.16.0~ubuntu4), util-linux, pkg-config, flex, bison, libunwind8-dev, libaudit-dev [amd64 i386] +Build-Depends: debhelper (>= 5), cpio, module-init-tools, kernel-wedge (>= 2.24ubuntu1), makedumpfile [amd64 i386], libelf-dev, libnewt-dev, binutils-dev, rsync, libdw-dev, dpkg (>= 1.16.0~ubuntu4), util-linux, pkg-config, flex, bison, libunwind8-dev, libaudit-dev [amd64 i386 armhf] Build-Depends-Indep: xmlto, docbook-utils, ghostscript, transfig, bzip2, sharutils, asciidoc Build-Conflicts: findutils (= 4.4.1-1ubuntu1) Vcs-Git: git://github.com/jcrigby/linaro-ci-kernels.git linux-linaro-origen-3.7_3.7.0-1.1--ci+121219092136 diff -Nru linux-linaro-origen-3.7-3.7.0/debian.linaro/control.stub linux-linaro-origen-3.7-3.7.0/debian.linaro/control.stub --- linux-linaro-origen-3.7-3.7.0/debian.linaro/control.stub 2013-01-18 09:15:21.000000000 +0000 +++ linux-linaro-origen-3.7-3.7.0/debian.linaro/control.stub 2013-01-23 16:46:14.000000000 +0000 @@ -3,7 +3,7 @@ Priority: optional Maintainer: Ubuntu Kernel Team Standards-Version: 3.8.4.0 -Build-Depends: debhelper (>= 5), cpio, module-init-tools, kernel-wedge (>= 2.24ubuntu1), makedumpfile [amd64 i386], libelf-dev, libnewt-dev, binutils-dev, rsync, libdw-dev, dpkg (>= 1.16.0~ubuntu4), util-linux, pkg-config, flex, bison, libunwind8-dev, libaudit-dev [amd64 i386] +Build-Depends: debhelper (>= 5), cpio, module-init-tools, kernel-wedge (>= 2.24ubuntu1), makedumpfile [amd64 i386], libelf-dev, libnewt-dev, binutils-dev, rsync, libdw-dev, dpkg (>= 1.16.0~ubuntu4), util-linux, pkg-config, flex, bison, libunwind8-dev, libaudit-dev [amd64 i386 armhf] Build-Depends-Indep: xmlto, docbook-utils, ghostscript, transfig, bzip2, sharutils, asciidoc Build-Conflicts: findutils (= 4.4.1-1ubuntu1) Vcs-Git: git://github.com/jcrigby/linaro-ci-kernels.git linux-linaro-origen-3.7_3.7.0-1.1--ci+121219092136 diff -Nru linux-linaro-origen-3.7-3.7.0/debian.linaro/control.stub.in linux-linaro-origen-3.7-3.7.0/debian.linaro/control.stub.in --- linux-linaro-origen-3.7-3.7.0/debian.linaro/control.stub.in 2013-01-18 09:15:11.000000000 +0000 +++ linux-linaro-origen-3.7-3.7.0/debian.linaro/control.stub.in 2013-01-22 18:35:20.000000000 +0000 @@ -3,7 +3,7 @@ Priority: optional Maintainer: Ubuntu Kernel Team Standards-Version: 3.8.4.0 -Build-Depends: debhelper (>= 5), cpio, module-init-tools, kernel-wedge (>= 2.24ubuntu1), makedumpfile [amd64 i386], libelf-dev, libnewt-dev, binutils-dev, rsync, libdw-dev, dpkg (>= 1.16.0~ubuntu4), util-linux, pkg-config, flex, bison, libunwind8-dev, libaudit-dev [amd64 i386] +Build-Depends: debhelper (>= 5), cpio, module-init-tools, kernel-wedge (>= 2.24ubuntu1), makedumpfile [amd64 i386], libelf-dev, libnewt-dev, binutils-dev, rsync, libdw-dev, dpkg (>= 1.16.0~ubuntu4), util-linux, pkg-config, flex, bison, libunwind8-dev, libaudit-dev [amd64 i386 armhf] Build-Depends-Indep: xmlto, docbook-utils, ghostscript, transfig, bzip2, sharutils, asciidoc Build-Conflicts: findutils (= 4.4.1-1ubuntu1) Vcs-Git: git://github.com/jcrigby/linaro-ci-kernels.git linux-linaro-origen-3.7_3.7.0-1.1--ci+121219092136 diff -Nru linux-linaro-origen-3.7-3.7.0/debian.linaro/rules.d/arm64.mk linux-linaro-origen-3.7-3.7.0/debian.linaro/rules.d/arm64.mk --- linux-linaro-origen-3.7-3.7.0/debian.linaro/rules.d/arm64.mk 2013-01-18 09:14:23.000000000 +0000 +++ linux-linaro-origen-3.7-3.7.0/debian.linaro/rules.d/arm64.mk 2013-01-23 16:43:16.000000000 +0000 @@ -1,10 +1,10 @@ human_arch = ARMv8 -build_arch = arm64 +kernel_arch = arm64 header_arch = arm64 defconfig = defconfig flavours = omap build_image = zImage -kernel_file = arch/$(build_arch)/boot/zImage +kernel_file = arch/$(kernel_arch)/boot/zImage install_file = vmlinuz no_dumpfile = true diff -Nru linux-linaro-origen-3.7-3.7.0/debian.linaro/rules.d/armhf.mk linux-linaro-origen-3.7-3.7.0/debian.linaro/rules.d/armhf.mk --- linux-linaro-origen-3.7-3.7.0/debian.linaro/rules.d/armhf.mk 2013-01-18 09:14:24.000000000 +0000 +++ linux-linaro-origen-3.7-3.7.0/debian.linaro/rules.d/armhf.mk 2013-01-23 16:42:57.000000000 +0000 @@ -1,11 +1,10 @@ human_arch = ARM (hard float) -build_arch = arm +kernel_arch = arm header_arch = arm defconfig = defconfig -#flavours = linaro-origen -flavours = linaro-origen +flavours = linaro-origen build_image = zImage -kernel_file = arch/$(build_arch)/boot/zImage +kernel_file = arch/$(kernel_arch)/boot/zImage install_file = vmlinuz no_dumpfile = true @@ -13,7 +12,7 @@ do_tools = true # Flavour specific configuration. -dtb_file_highbank = arch/$(build_arch)/boot/highbank.dtb +dtb_file_highbank = arch/$(kernel_arch)/boot/highbank.dtb skipmodule = true skipabi = true disable_d_i = true