org.oe.dev linux 2.6.22: Alix boards use bzImage kernels
Review inherit kernel · line 17
Quoted 10 lines · hrw commit
packages/linux/linux.inc
86d436757b3b9cb61a1a381d76950ef21596b40c
+++ packages/linux/linux.inca948d889b8d420c7a04eb140caaa353601fa7722(quoted diff) +1
-0@@ -11,6 +11,7 @@ inherit kernel inherit kernel +KERNEL_IMAGETYPE_alix = "bzImage" KERNEL_IMAGETYPE_progear = "bzImage" KERNEL_IMAGETYPE_simpad = "zImage" KERNEL_IMAGETYPE_kb9202 = "uImage"
Should these not really go into the machine.conf files?
Cheers,
Richard
Quoted 5 lines · Richard Purdie
Quoted 4 lines · hrw commit
packages/linux/linux.inc
86d436757b3b9cb61a1a381d76950ef21596b40c
+++ packages/linux/linux.inca948d889b8d420c7a04eb140caaa353601fa7722(quoted diff) +0
-0@@ -11,6 +11,7 @@ inherit kernel
Quoted 8 lines
Review inherit kernel · line 17
Quoted 6 lines
(quoted diff) +1
-0inherit kernel +KERNEL_IMAGETYPE_alix = "bzImage" KERNEL_IMAGETYPE_progear = "bzImage" KERNEL_IMAGETYPE_simpad = "zImage" KERNEL_IMAGETYPE_kb9202 = "uImage"Should these not really go into the machine.conf files?
Right - I looked at it and prepared patch. It removes KERNEL_IMAGETYPE = "zImage" entries from kernel recipes and also sets this variable into bzImage for x86 machines which already use that type of kernels. Rest of machines are untouched (yet) - I can convert them if we reach consensus about it.
Please review and comment.
#
# old_revision [2940479bcfd956eef260cc704db455cc804377b8] # # patch "conf/machine/alix.conf" # from [76cc73f8bf7af8542d445c5d919516e000352bb2] # to [6ac777208694aa9b00784052d5baca787f429532] # # patch "conf/machine/epia.conf" # from [641965dd32edeeb4a10890be1b0bc3339fe13559] # to [b9d513ffac950087fa7ca9ed84684b6186b32006] # # patch "conf/machine/geodegx.conf" # from [5e1cc5910b747a31bf87753033236a9d383249a7] # to [444f8e041fee062b1341f33d482b9e8283d8f612] # # patch "conf/machine/geodelx.conf" # from [bb33a4392a78a281646a05e283d68c64bdca7024] # to [aa16341564f7ffa56c1ca89a603a1f1a6b15efd2] # # patch "conf/machine/guinness.conf" # from [83ad2351ae9b942f6123ebaa254deff0ea2ecdce] # to [a0afdf0c7e1609a6ccdc964544650fb1848ec71d] # # patch "conf/machine/i586-generic.conf" # from [9ade4b2570050666438641b4db85710e2d9ec721] # to [c5fd72db431ef2ed503db0c88c5b22e788be90bd] # # patch "conf/machine/i686-generic.conf" # from [0c20422ac9dbb45e4ed402a12f60f084001e1950] # to [669fc531794bbc10ec2d56acd9c276fa190eb66f] # # patch "conf/machine/netvista.conf" # from [9156f4e8eef6278994d8a65b98af005cc02ce8c3] # to [5fa034197f2e35cab1099297e0461c05d84a1401] # # patch "conf/machine/progear.conf" # from [f90862448b84e7a6b56bc57d0fdbff0c74afb962] # to [22e49b5432e36f46f19bdb061e0226cda4016d6c] # # patch "conf/machine/wrap.conf" # from [395efcd512a7f26154822bf1fccb616d13530b41] # to [7364205fdb720403971f54dc88bc58479794a3a2] # # patch "conf/machine/x86.conf" # from [b21f06ca6ceca10e06c6a04b1468646cee2ab1ed] # to [fd2741fa548e1bd37870753be26d6fdbf6a1c609] # # patch "packages/linux/compulab-pxa270_2.6.16.bb" # from [aa641b64bcb45bd089254790a8c5e4761f3d34cd] # to [0c6af5bfc65c32891fcb4178365c351daae00104] # # patch "packages/linux/compulab-pxa270_2.6.22.bb" # from [1bdb034c9f1a50b53b64d34bec8b58051d785b39] # to [5ebc3263cfaa5a0c4ad824cad9c7edf5b0ada3e8] # # patch "packages/linux/ep93xx-kernel_2.6.17+2.6.18-rc1.bb" # from [dcd35fc04c8610d3401b02f9fceb83aba1bc7af5] # to [1b6e37dd7b8a233d87a5541a13384e0b92f09551] # # patch "packages/linux/ep93xx-kernel_2.6.19+2.6.20-rc7.bb" # from [e1963406fa064a6a1e03de76279a0d8a5b0a4d18] # to [a452af7d69c3d884966354e28c8547c6bcb16b6b] # # patch "packages/linux/gumstix_2.6.5-gnalm1-gum0.bb" # from [87f733f6a1faf24ee781daaaca1bd22630c3983a] # to [fdc1fc004816ab2ba19c67c750089f372b1b79d6] # # patch "packages/linux/ixp4xx-kernel.inc" # from [5df5d3d8b85636bea02f6cffa26e60e0ef7a3395] # to [b22efce3723a42731a6940b02489811fb8a36033] # # patch "packages/linux/linux-bast_2.4.25-vrs1-bast1.bb" # from [faece28efc9c896b9809dfacdabb4a939cf68a1c] # to [df048a34175cab1b8c85c6245f75d98d956c7cea] # # patch "packages/linux/linux-dht-walnut_2.6.20.bb" # from [f23c8800451f8371e22b01fd97f62d7bc93b9c4a] # to [62bdf8a25e2c69fa6d78f11a236567cc8e3205ea] # # patch "packages/linux/linux-efika_2.6.18+2.6.19-rc6.bb" # from [26c6ea4ead01ea2614688932a93b68c6215afdac] # to [9854e7470109cece86c7335b8261fa4a6c33df31] # # patch "packages/linux/linux-efika_2.6.20.11.bb" # from [be89150b4d46aed07ccd431fe8c4963bef2deba2] # to [53022093ad12a60cc0933f2a6810354444e127ba] # # patch "packages/linux/linux-efika_2.6.20.bb" # from [d3982290372da2fd491b19ad60ebd0d5c7121940] # to [3d646a13d61ed36e48613a5d62ae4c153c42616e] # # patch "packages/linux/linux-efika_2.6.21+git.bb" # from [ac553b761959b48ae473369a31200d64d21b8bc1] # to [b07652616db0ca693ab942e5d21576b84f04e3e9] # # patch "packages/linux/linux-epia_2.6.11.bb" # from [903103f0ec8d78b208a8660071f47ec2baf873f5] # to [93e75918088864b7f04aca262d615924e10a2833] # # patch "packages/linux/linux-epia_2.6.12.bb" # from [903103f0ec8d78b208a8660071f47ec2baf873f5] # to [93e75918088864b7f04aca262d615924e10a2833] # # patch "packages/linux/linux-epia_2.6.19.2.bb" # from [d1c3796fe52187e52ff416e1d81febd760d7346e] # to [c84d3200e46f529c77d4c00bd469fd83108d5b99] # # patch "packages/linux/linux-epia_2.6.8.1.bb" # from [14f1634043c8b7c1bca6c32092bf7852f4e3e1bb] # to [bdc528707a6e7d014e266824d5c4d1687d85335a] # # patch "packages/linux/linux-geodegx_2.4.24.bb" # from [0f8264df74e53af065156b9188da82b8c7e2bc88] # to [4dcd1289300ea012a8a58e81c2327f6488b8711c] # # patch "packages/linux/linux-geodelx_2.6.11.bb" # from [f4d7f194aba34c9e9821faca92f46ee79cc0a1ee] # to [3c040c734a2e18dcf441027c590fb3f91ced1c97] # # patch "packages/linux/linux-jlime-jornada6xx_2.6.11.bb" # from [af7ddf2a65542bb32bcb4691213b37d5ba6eb1dc] # to [e5690ef11fcf56b6afea05914a8d0cc43fdd8ddd] # # patch "packages/linux/linux-jlime-jornada6xx_2.6.17.bb" # from [fede3cfe1e098ea6500541a69e670e1b3cd14334] # to [1812cd357f386bde56fd123ad05f999bfbfc523f] # # patch "packages/linux/linux-jlime-jornada6xx_2.6.21rc5.bb" # from [01422f4f26a644bed8747acc10c7d4d714ffeb36] # to [d8e50205bd984595d687ef8c1029648c350148b2] # # patch "packages/linux/linux-jlime-jornada7xx_2.6.17.bb" # from [3a1791a967a683726c05fac49fb7c14f160a700f] # to [118cea8f14b2829631e191683adac8664625d2dc] # # patch "packages/linux/linux-jlime-jornada7xx_2.6.18.bb" # from [ff55a9efa019d3d8e21af011e07ee01100b91848] # to [90de1d3f21ac6715b8d8969408329c528a928370] # # patch "packages/linux/linux-jlime-jornada7xx_2.6.19rc6.bb" # from [3959ca27f5a06b424f0bb1f9a59522912c2eb7c4] # to [6677636ce3a207ec5a71b92b00c6a6b00c6164e3] # # patch "packages/linux/linux-ks8695_2.6.16.bb" # from [88d34854638d1b8af246b4fb121a7dabe93f1e68] # to [e5f8049819e2048b2ea04c0f1163f86c9d33187e] # # patch "packages/linux/linux-magicbox_2.6.18.6.bb" # from [36f1edd7d1aeb89d96beb3deeab687c7fce9d186] # to [2863c6191e6edd688014663327d3b35bfd47e9ea] # # patch "packages/linux/linux-magicbox_2.6.19.2.bb" # from [05dda399b21a75a6c9d941f43fac2a79cbde0ed3] # to [b03c2ca7543c5914973b54ef5b3ea159fbef77ed] # # patch "packages/linux/linux-navman_2.6.18.bb" # from [6699ef3cc099f09038308c948fd95a1ad4dff05a] # to [170d50b807364f5b39aaf8a74d85700e2d5ef059] # # patch "packages/linux/linux-smdk2440_2.6.20+git.bb" # from [18356541f23103914af0a85b4f7fa0aa4b86be62] # to [c6bddc2c20ea68b01d4e8457000fdb982a675840] # # patch "packages/linux/linux-smdk2443_2.6.20+git.bb" # from [c27379189e17f0ff7e634ba08b7076848bbe8924] # to [43c2952116b3749fac68666c3f67f36bf48154fe] # # patch "packages/linux/linux-titan-sh4_2.6.21.bb" # from [e75fe7d65a0714c1b8a9f6739c3f014b837f5d5e] # to [6fefbc4900cda6b0514fd2a743a6e165079f97e3] # # patch "packages/linux/linux-wrap-geode_2.6.17.bb" # from [4f19f4bd6b8a65202b6cf9f5c9d9432abd812843] # to [1019b36ade3b6c60f90d75052adcaf855a84cf1e] # # patch "packages/linux/linux-wrt_2.4.20.bb" # from [bddab456f7d0a6cc9beb1b053e0262d1beb250e4] # to [ce82a3361914a1863ec5646e35eb6492f5babb69] # # patch "packages/linux/linux-wrt_2.4.30.bb" # from [b8aa4db419b43497fbc60f270fe96bf5c378ba29] # to [fe9df0285b627d50369b865bce0ec5e3c3756664] # # patch "packages/linux/linux-x86_2.6.17.9.bb" # from [fd8dcd3d6f94f7678520d2e58dfcdc840f519383] # to [d9e906c9c879542774e10ad7ffa98e7efd2aff28] # # patch "packages/linux/linux-x86_2.6.20.bb" # from [3d74ce752eaf5a8499ddde36a0737d0fd00be798] # to [51976b5e538dd765ee4a066c915c690bd1869f13] # # patch "packages/linux/linux-z_2.6.20.bb" # from [9328ed9184d55acca2eb8706c5c5269a50db4c18] # to [ccf3caf757e0af9ff958e12378d47c28314dd53a] # # patch "packages/linux/linux_2.6.14.bb" # from [5f4838349e488f7892c5923ac0b8a867dd363d0e] # to [b82a29e8d88496dc90966389ceb094a394c9afcf] # # patch "packages/linux/logicpd-pxa270_2.6.17-rc5.bb" # from [3bd76ea4a1dfbbacb419d79f9dc40e4435ef7975] # to [9fab46f9b5a54dc6a7f752e4fefaff2e81d1f54d] # # patch "packages/linux/logicpd-pxa270_2.6.19.2.bb" # from [f4207e81635c59f6a4f04f0ea09683fef6ed465d] # to [3e9ccae6c92fe9092727de6d7d781be339abbb88] # # patch "packages/linux/mainstone-kernel_2.6.11.bb" # from [3acf3eec7603bddb52b95b3b47ffe7213a53761b] # to [d5a9b182d8e86b8f4b7b579cdfcfe40bf7616703] # # patch "packages/linux/mainstone-kernel_2.6.18.bb" # from [6b8c146d01ed8d62508ecbafffdd9f60c5991534] # to [76dd39cb1faf78b2f6fd5770e7aba9d18413bf23] # # patch "packages/linux/mx21ads-kernel_2.6.19rc6.bb" # from [77fadc2dc3f30fb6620948536b9602e884556195] # to [eb89e283bb375e8deefb9398a9f77334e4b32a4d] # # patch "packages/linux/mx31ads-kernel_2.6.19rc6.bb" # from [717a846d8445eaa78401ae66b0426d3f3bbf7e37] # to [3c6294ce239293d9c65f68e973f7ea4a89f122aa] # # patch "packages/linux/netbook-pro-kernel_2.6.17.bb" # from [9f5625d59ad0b17c2102d8b094c980839c691827] # to [adcec4915e8ffc89681f8dd32ddca0cbcaed2d47] # # patch "packages/linux/triton-kernel_2.6.11.bb" # from [113a96e8e2dcc8fe143af2ad0feb6c53179f1ebc] # to [5c76121264ec80611a8d410d965dadb3d129cee5] # # patch "packages/linux/unslung-kernel_2.4.22.l2.3r63.bb" # from [f75223758a267c3ed4d7b73bcb5deb2688268664] # to [3cf3e65980ff2941b1b15dd46f53d088a8f88462] # ============================================================ --- conf/machine/alix.conf 76cc73f8bf7af8542d445c5d919516e000352bb2 +++ conf/machine/alix.conf 6ac777208694aa9b00784052d5baca787f429532 @@ -22,3 +22,5 @@ MACHINE_EXTRA_RRECOMMENDS = "\ MACHINE_EXTRA_RRECOMMENDS = "\ kernel-modules \ " + +KERNEL_IMAGETYPE = "bzImage" ============================================================ --- conf/machine/epia.conf 641965dd32edeeb4a10890be1b0bc3339fe13559 +++ conf/machine/epia.conf b9d513ffac950087fa7ca9ed84684b6186b32006 @@ -5,6 +5,7 @@ OLDEST_KERNEL = "2.6.5"
PREFERRED_PROVIDER_virtual/kernel = "linux-epia"
OLDEST_KERNEL = "2.6.5"
+KERNEL_IMAGETYPE = "bzImage"
GLIBC_ADDONS = "nptl"
GLIBC_EXTRA_OECONF = "--with-tls"
============================================================
machine/geodegx.conf +2 -0
@@ -8,3 +8,5 @@ udevdir = "/dev" BOOTSTRAP_EXTRA_RDEPENDS = "kernel pciutils udev kernel-modules" udevdir = "/dev" + +KERNEL_IMAGETYPE = "bzImage"
============================================================
machine/geodelx.conf +2 -0
@@ -5,3 +5,5 @@ SELECTED_OPTIMIZATION_glibc := "${@'${SE PREFERRED_PROVIDER_virtual/kernel="linux-geodelx" SELECTED_OPTIMIZATION_glibc := "${@'${SELECTED_OPTIMIZATION}'.replace('-fomit-frame-pointer', '')}" + +KERNEL_IMAGETYPE = "bzImage"
============================================================
machine/guinness.conf +2 -0
@@ -11,6 +11,8 @@ udevdir = "/dev" udevdir = "/dev" +KERNEL_IMAGETYPE = "bzImage" + OLDEST_KERNEL = "2.6.17" GLIBC_ADDONS = "nptl" GLIBC_EXTRA_OECONF = "--with-tls"
============================================================
machine/i586-generic.conf +2 -0
@@ -12,6 +12,8 @@ OLDEST_KERNEL = "2.6.18" PREFERRED_PROVIDER_virtual/kernel = "linux-x86" OLDEST_KERNEL = "2.6.18" +KERNEL_IMAGETYPE = "bzImage" + GLIBC_ADDONS = "nptl" GLIBC_EXTRA_OECONF = "--with-tls"
============================================================
machine/i686-generic.conf +2 -0
@@ -11,6 +11,8 @@ OLDEST_KERNEL = "2.6.20" PREFERRED_PROVIDER_virtual/kernel = "linux-x86" OLDEST_KERNEL = "2.6.20" +KERNEL_IMAGETYPE = "bzImage" + GLIBC_ADDONS = "nptl" GLIBC_EXTRA_OECONF = "--with-tls"
============================================================
machine/netvista.conf +2 -0
@@ -9,6 +9,8 @@ XSERVER = "xserver-kdrive-vesa" PREFERRED_PROVIDER_virtual/kernel = "linux-x86" XSERVER = "xserver-kdrive-vesa" +KERNEL_IMAGETYPE = "bzImage" + # todo: convert to task-base # BOOTSTRAP_EXTRA_RDEPENDS = "kernel pciutils udev kernel-modules" MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
============================================================
machine/progear.conf +2 -0
@@ -9,6 +9,8 @@ PREFERRED_PROVIDER_virtual/xserver = "xs PREFERRED_PROVIDER_virtual/kernel = "linux" PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" +KERNEL_IMAGETYPE = "bzImage" + OLDEST_KERNEL = "2.6.17" GLIBC_ADDONS = "nptl" GLIBC_EXTRA_OECONF = "--with-tls"
============================================================
machine/wrap.conf +2 -0
@@ -32,3 +32,5 @@ GLIBC_EXTRA_OECONF = "--with-tls" # glibc GLIBC_ADDONS = "nptl" GLIBC_EXTRA_OECONF = "--with-tls" + +KERNEL_IMAGETYPE = "bzImage"
============================================================
machine/x86.conf +2 -0
@@ -7,6 +7,8 @@ PREFERRED_PROVIDER_virtual/kernel = "lin # TARGET_VENDOR = "-oe" PACKAGE_EXTRA_ARCHS = "x86" PREFERRED_PROVIDER_virtual/kernel = "linux-x86" + +KERNEL_IMAGETYPE = "bzImage" # todo: convert to task-base # BOOTSTRAP_EXTRA_RDEPENDS = "kernel pciutils udev kernel-modules" MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
============================================================
linux/compulab-pxa270_2.6.16.bb +0 -1
@@ -23,7 +23,6 @@ ARCH = "arm" inherit package ARCH = "arm" -KERNEL_IMAGETYPE = "zImage" FILES_kernel-image = ""
============================================================
linux/compulab-pxa270_2.6.22.bb +0 -1
@@ -34,7 +34,6 @@ ARCH = "arm" inherit package ARCH = "arm" -KERNEL_IMAGETYPE = "zImage" FILES_kernel-image = ""
============================================================
linux/ep93xx-kernel_2.6.17+2.6.18-rc1.bb +0 -1
@@ -16,7 +16,6 @@ inherit kernel inherit kernel -KERNEL_IMAGETYPE = "zImage"
============================================================
linux/ep93xx-kernel_2.6.19+2.6.20-rc7.bb +0 -1
@@ -15,7 +15,6 @@ inherit kernel inherit kernel -KERNEL_IMAGETYPE = "zImage"
============================================================
linux/gumstix_2.6.5-gnalm1-gum0.bb +0 -1
@@ -16,7 +16,6 @@ inherit kernel inherit kernel -KERNEL_IMAGETYPE = "zImage" do_configure_prepend() { install -m 0644 ${WORKDIR}/defconfig ${S}/.config || die "no default configuration for ${MACHINE} available."
============================================================
linux/ixp4xx-kernel.inc +0 -1
@@ -156,7 +156,6 @@ ARCH = "arm" inherit kernel ARCH = "arm" -KERNEL_IMAGETYPE = "zImage" # To specify the console set KERNEL_CONSOLE in the .bb file. # CMDLINE_ROOT contains the boot options, these will be
============================================================
linux/linux-bast_2.4.25-vrs1-bast1.bb +0 -1
@@ -16,7 +16,6 @@ inherit kernel inherit kernel -KERNEL_IMAGETYPE = "zImage" do_configure_prepend() { cp ${WORKDIR}/defconfig ${S}/.config
============================================================
linux/linux-dht-walnut_2.6.20.bb +0 -1
@@ -21,7 +21,6 @@ ARCH = "ppc" export OS = "Linux" ARCH = "ppc" -KERNEL_IMAGETYPE = "zImage" KERNEL_OUTPUT = "arch/ppc/boot/images/zImage.elf"
============================================================
linux/linux-efika_2.6.18+2.6.19-rc6.bb +0 -1
@@ -19,7 +19,6 @@ export ARCH="powerpc" export ARCH="powerpc" -KERNEL_IMAGETYPE = "zImage" do_configure() { install -m 644 ${WORKDIR}/defconfig ${S}/.config
============================================================
linux/linux-efika_2.6.20.11.bb +0 -1
@@ -53,7 +53,6 @@ export ARCH="powerpc" export ARCH="powerpc" -KERNEL_IMAGETYPE = "zImage" do_configure() { install -m 644 ${WORKDIR}/defconfig ${S}/.config
============================================================
linux/linux-efika_2.6.20.bb +0 -1
@@ -50,7 +50,6 @@ export ARCH="powerpc" export ARCH="powerpc" -KERNEL_IMAGETYPE = "zImage" do_configure() { install -m 644 ${WORKDIR}/defconfig ${S}/.config
============================================================
linux/linux-efika_2.6.21+git.bb +0 -1
@@ -16,7 +16,6 @@ export ARCH="powerpc" export ARCH="powerpc" -KERNEL_IMAGETYPE = "zImage" do_fetch () { cd ${WORKDIR}
============================================================
linux/linux-epia_2.6.11.bb +0 -1
@@ -15,7 +15,6 @@ ARCH = "i386" inherit kernel ARCH = "i386" -KERNEL_IMAGETYPE = "bzImage" # Don't want kernel in rootfs FILES_kernel = ""
============================================================
linux/linux-epia_2.6.12.bb +0 -1
@@ -15,7 +15,6 @@ ARCH = "i386" inherit kernel ARCH = "i386" -KERNEL_IMAGETYPE = "bzImage" # Don't want kernel in rootfs FILES_kernel = ""
============================================================
linux/linux-epia_2.6.19.2.bb +0 -1
@@ -14,7 +14,6 @@ ARCH = "i386" inherit kernel ARCH = "i386" -KERNEL_IMAGETYPE = "bzImage" # Don't want kernel in rootfs FILES_kernel = ""
============================================================
linux/linux-epia_2.6.8.1.bb +0 -1
@@ -14,7 +14,6 @@ ARCH = "i386" inherit kernel ARCH = "i386" -KERNEL_IMAGETYPE = "bzImage" # Don't want kernel in rootfs FILES_kernel = ""
============================================================
linux/linux-geodegx_2.4.24.bb +0 -1
@@ -19,7 +19,6 @@ ARCH = "i386" inherit kernel ARCH = "i386" -KERNEL_IMAGETYPE = "bzImage" do_configure_prepend() { install -m 0644 ${WORKDIR}/defconfig ${S}/.config
============================================================
linux/linux-geodelx_2.6.11.bb +0 -1
@@ -19,7 +19,6 @@ ARCH = "i386" inherit kernel ARCH = "i386" -KERNEL_IMAGETYPE = "bzImage" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${KV}.tar.bz2 \ http://www.amd.com/files/connectivitysolutions/geode/geode_lx/${AMD_DRIVER_LABEL}.patch;patch=1 \
============================================================
linux/linux-jlime-jornada6xx_2.6.11.bb +0 -1
@@ -15,7 +15,6 @@ ARCH = "sh" inherit kernel ARCH = "sh" -KERNEL_IMAGETYPE = "zImage" FILES_kernel-image = "/boot/${KERNEL_IMAGETYPE}*" do_configure_prepend() {
============================================================
linux/linux-jlime-jornada6xx_2.6.17.bb +0 -1
@@ -22,7 +22,6 @@ ARCH = "sh" KERNEL_CCSUFFIX = "-3.4.4" ARCH = "sh" -KERNEL_IMAGETYPE = "zImage" FILES_kernel-image = "/boot/${KERNEL_IMAGETYPE}*" do_configure_prepend() {
============================================================
linux/linux-jlime-jornada6xx_2.6.21rc5.bb +0 -1
@@ -20,7 +20,6 @@ ARCH = "sh" KERNEL_CCSUFFIX = "-3.4.4" ARCH = "sh" -KERNEL_IMAGETYPE = "zImage" FILES_kernel-image = "/boot/${KERNEL_IMAGETYPE}*" do_configure_prepend() {
============================================================
linux/linux-jlime-jornada7xx_2.6.17.bb +0 -1
@@ -30,7 +30,6 @@ ARCH = "arm" KERNEL_CCSUFFIX = "-3.4.4" ARCH = "arm" -KERNEL_IMAGETYPE = "zImage" FILES_kernel-image = "/boot/${KERNEL_IMAGETYPE}*" do_configure_prepend() {
============================================================
linux/linux-jlime-jornada7xx_2.6.18.bb +0 -1
@@ -18,7 +18,6 @@ ARCH = "arm" KERNEL_CCSUFFIX = "-3.4.4" ARCH = "arm" -KERNEL_IMAGETYPE = "zImage" FILES_kernel-image = "/boot/${KERNEL_IMAGETYPE}*" do_configure_prepend() {
============================================================
linux/linux-jlime-jornada7xx_2.6.19rc6.bb +0 -1
@@ -19,7 +19,6 @@ ARCH = "arm" KERNEL_CCSUFFIX = "-3.4.4" ARCH = "arm" -KERNEL_IMAGETYPE = "zImage" FILES_kernel-image = "/boot/${KERNEL_IMAGETYPE}*"
============================================================
linux/linux-ks8695_2.6.16.bb +0 -1
@@ -17,7 +17,6 @@ ARCH = "arm" inherit package ARCH = "arm" -KERNEL_IMAGETYPE = "zImage" CMDLINE = "ttyS0,115200n8 root=/dev/mtdblock2 init=/linuxrc" do_configure_prepend() {
============================================================
linux/linux-magicbox_2.6.18.6.bb +0 -1
@@ -30,7 +30,6 @@ ARCH = "ppc" export OS = "Linux" ARCH = "ppc" -KERNEL_IMAGETYPE = "zImage" KERNEL_OUTPUT = "arch/ppc/boot/images/zImage.elf"
============================================================
linux/linux-magicbox_2.6.19.2.bb +0 -1
@@ -63,7 +63,6 @@ ARCH = "ppc" export OS = "Linux" ARCH = "ppc" -KERNEL_IMAGETYPE = "zImage" KERNEL_OUTPUT = "arch/ppc/boot/images/zImage.elf"
============================================================
linux/linux-navman_2.6.18.bb +0 -1
@@ -17,7 +17,6 @@ inherit kernel inherit kernel -KERNEL_IMAGETYPE = "zImage" do_configure() { rm -f ${S}/.config
============================================================
linux/linux-smdk2440_2.6.20+git.bb +0 -1
@@ -15,7 +15,6 @@ COMPATIBLE_MACHINE = "smdk2440" COMPATIBLE_HOST = "arm.*-linux" COMPATIBLE_MACHINE = "smdk2440" -KERNEL_IMAGETYPE = "zImage" do_configure() { install ${WORKDIR}/defconfig-smdk2440 ${S}/.config
============================================================
linux/linux-smdk2443_2.6.20+git.bb +0 -1
@@ -25,7 +25,6 @@ COMPATIBLE_MACHINE = "smdk2443" COMPATIBLE_HOST = "arm.*-linux" COMPATIBLE_MACHINE = "smdk2443" -KERNEL_IMAGETYPE = "zImage" do_configure() { install ${WORKDIR}/defconfig-smdk2443 ${S}/.config
============================================================
linux/linux-titan-sh4_2.6.21.bb +0 -1
@@ -16,7 +16,6 @@ ARCH = "sh" inherit kernel ARCH = "sh" -KERNEL_IMAGETYPE = "zImage" KERNEL_OUTPUT = "arch/${ARCH}/boot/${KERNEL_IMAGETYPE}" #
============================================================
linux/linux-wrap-geode_2.6.17.bb +0 -1
@@ -14,7 +14,6 @@ ARCH = "i386" inherit kernel ARCH = "i386" -KERNEL_IMAGETYPE = "bzImage" KERNEL_OUTPUT = "arch/${ARCH}/boot/${KERNEL_IMAGETYPE}" do_configure_prepend() {
============================================================
linux/linux-wrt_2.4.20.bb +0 -1
@@ -26,7 +26,6 @@ inherit kernel inherit kernel -KERNEL_IMAGETYPE ?= "zImage" CMDLINE_CONSOLE ?= "ttyS0,115200n8" CMDLINE_ROOT ?= "root=/dev/mtdblock2 noinitrd" # CMDLINE_INIT = "init=/bin/busybox ash"
============================================================
linux/linux-wrt_2.4.30.bb +0 -1
@@ -75,7 +75,6 @@ inherit kernel inherit kernel -KERNEL_IMAGETYPE ?= "zImage" KERNEL_OUTPUT = "arch/mips/brcm-boards/bcm947xx/compressed/piggy" CMDLINE = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 console=ttyS0,115200"
============================================================
linux/linux-x86_2.6.17.9.bb +0 -1
@@ -11,7 +11,6 @@ COMPATIBLE_HOST = "i.86.*-linux" inherit kernel COMPATIBLE_HOST = "i.86.*-linux" -KERNEL_IMAGETYPE = "bzImage" do_configure_prepend() { install -m 0644 ${WORKDIR}/defconfig ${S}/.config
============================================================
linux/linux-x86_2.6.20.bb +0 -1
@@ -15,7 +15,6 @@ COMPATIBLE_HOST = "i.86.*-linux" inherit kernel COMPATIBLE_HOST = "i.86.*-linux" -KERNEL_IMAGETYPE = "bzImage" do_configure_prepend_x86() { install -m 0644 ${WORKDIR}/i486-defconfig ${S}/.config
============================================================
linux/linux-z_2.6.20.bb +0 -1
@@ -15,7 +15,6 @@ COMPATIBLE_MACHINE = '(shark)' COMPATIBLE_MACHINE = '(shark)' -KERNEL_IMAGETYPE = "zImage" do_configure_prepend() {
============================================================
linux/linux_2.6.14.bb +0 -4
@@ -42,10 +42,6 @@ inherit kernel inherit kernel -KERNEL_IMAGETYPE = "bzImage" -KERNEL_IMAGETYPE_simpad = "zImage" -KERNEL_IMAGETYPE_acern30 = "zImage" - do_configure_prepend() { install -m 0644 ${WORKDIR}/defconfig ${S}/.config }
============================================================
linux/logicpd-pxa270_2.6.17-rc5.bb +0 -1
@@ -17,7 +17,6 @@ ARCH = "arm" inherit package ARCH = "arm" -KERNEL_IMAGETYPE = "zImage" FILES_kernel-image = ""
============================================================
linux/logicpd-pxa270_2.6.19.2.bb +0 -1
@@ -38,7 +38,6 @@ ARCH = "arm" inherit package ARCH = "arm" -KERNEL_IMAGETYPE = "zImage" FILES_kernel-image = ""
============================================================
linux/mainstone-kernel_2.6.11.bb +0 -1
@@ -14,7 +14,6 @@ ARCH = "arm" inherit package ARCH = "arm" -KERNEL_IMAGETYPE = "zImage" #CMDLINE_CONSOLE ?= "ttyS0,115200n8" #CMDLINE_ROOT = "root=/dev/slug rootfstype=ext2,jffs2 initrd=0x01000000,10M mem=32M@0x00000000" #CMDLINE_ROOT = "root=/dev/mtdblock4 rootfstype=jffs2 mem=32M@0x00000000"
============================================================
linux/mainstone-kernel_2.6.18.bb +0 -1
@@ -14,7 +14,6 @@ ARCH = "arm" inherit package ARCH = "arm" -KERNEL_IMAGETYPE = "zImage" #CMDLINE_CONSOLE ?= "ttyS0,115200n8" #CMDLINE_ROOT = "root=/dev/slug rootfstype=ext2,jffs2 initrd=0x01000000,10M mem=32M@0x00000000" #CMDLINE_ROOT = "root=/dev/mtdblock4 rootfstype=jffs2 mem=32M@0x00000000"
============================================================
linux/mx21ads-kernel_2.6.19rc6.bb +0 -1
@@ -18,7 +18,6 @@ ARCH = "arm" inherit kernel ARCH = "arm" -KERNEL_IMAGETYPE = "zImage" RPROVIDES_kernel-image += "hostap-modules" #CMDLINE_ROOT = "root=/dev/mtdblock4 rootfstype=jffs2 mem=32M@0x00000000"
============================================================
linux/mx31ads-kernel_2.6.19rc6.bb +0 -1
@@ -18,7 +18,6 @@ ARCH = "arm" inherit kernel ARCH = "arm" -KERNEL_IMAGETYPE = "zImage" RPROVIDES_kernel-image += "hostap-modules" #CMDLINE_ROOT = "root=/dev/mtdblock4 rootfstype=jffs2 mem=32M@0x00000000"
============================================================
linux/netbook-pro-kernel_2.6.17.bb +0 -1
@@ -16,7 +16,6 @@ inherit kernel inherit kernel -KERNEL_IMAGETYPE = "zImage"
============================================================
linux/triton-kernel_2.6.11.bb +0 -1
@@ -17,7 +17,6 @@ ARCH = "arm" inherit kernel ARCH = "arm" -KERNEL_IMAGETYPE = "zImage" CMDLINE ?= "root=/dev/mtdblock2 rw rootfstype=jffs2 reboot=5" do_configure_prepend() {
============================================================
linux/unslung-kernel_2.4.22.l2.3r63.bb +0 -1
@@ -38,7 +38,6 @@ ARCH = "arm" inherit kernel ARCH = "arm" -KERNEL_IMAGETYPE = "zImage" KERNEL_SUFFIX = "ixp4xxbe" CMDLINE_CONSOLE ?= "ttyS0,115200" CMDLINE_ROOT = "root=/dev/mtdblock4 rootfstype=jffs2 rw init=/linuxrc mem=32M@0x00000000"
Signature · 4 lines
JID: hrw-jabber.org
OpenEmbedded developer/consultant
Wykład o podróżach w czasie odbędzie się w zeszły wtorek-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Marcin Juszkiewicz schreef:
Quoted 14 lines
Quoted 5 lines · Richard Purdie
Quoted 4 lines · hrw commit
packages/linux/linux.inc
86d436757b3b9cb61a1a381d76950ef21596b40c
+++ packages/linux/linux.inca948d889b8d420c7a04eb140caaa353601fa7722(quoted diff) +0
-0@@ -11,6 +11,7 @@ inherit kernelQuoted 7 lines
Review inherit kernel · line 17
Quoted 6 lines
(quoted diff) +1
-0inherit kernel +KERNEL_IMAGETYPE_alix = "bzImage" KERNEL_IMAGETYPE_progear = "bzImage" KERNEL_IMAGETYPE_simpad = "zImage" KERNEL_IMAGETYPE_kb9202 = "uImage"Should these not really go into the machine.conf files?
Quoted 7 lines
Right - I looked at it and prepared patch. It removes
KERNEL_IMAGETYPE= "zImage" entries from kernel recipes and also sets this variable into bzImage for x86 machines which already use that type of kernels. Rest of machines are untouched (yet) - I can convert them if we reach consensus about it.Please review and comment.
What about poking machine maintainer to start using linux.inc direcly as well instead of duplicating it?
regards,
Koen
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
iD8DBQFGyX7+MkyGM64RGpERAsD0AKCSAYvY2XbMLFZAXpr5IHpi1TZLiQCfQzP5 seC/1I7mSPzgum86h+ldOZI=
=BCK8
-----END PGP SIGNATURE-----
Quoted 4 lines · Koen Kooi
Marcin Juszkiewicz schreef:
Quoted 2 lines
Quoted 1 line · Richard Purdie
On Tue, 2007-08-07 at 15:56 +0200, hrw commit wrote:
Quoted 8 lines
Quoted 5 lines
Right - I looked at it and prepared patch. It removes
KERNEL_IMAGETYPE= "zImage" entries from kernel recipes and also sets this variable into bzImage for x86 machines which already use that type of kernels. Rest of machines are untouched (yet) - I can convert them if we reach consensus about it.What about poking machine maintainer to start using linux.inc direcly as well instead of duplicating it?
Some parts of linux.inc stuff should probably go into kernel.bbclass so we will get it included in all kernel recipes. Things like EABI/OABI automagic for ARM, creating of archive with kernel modules are nice addons.
But linux.inc is another thing then KERNEL_IMAGETYPE cleanup. But I have to admit that I missed it during first part of cleaning.
Signature · 4 lines
JID: hrw-jabber.org OpenEmbedded developer/consultant I don't know what your problem is, but I'll bet it's hard to pronounce.
Quoted 15 lines · Marcin Juszkiewicz
Quoted 5 lines · Richard Purdie
Quoted 4 lines · hrw commit
packages/linux/linux.inc
86d436757b3b9cb61a1a381d76950ef21596b40c
+++ packages/linux/linux.inca948d889b8d420c7a04eb140caaa353601fa7722(quoted diff) +0
-0@@ -11,6 +11,7 @@ inherit kernelQuoted 8 lines
Review inherit kernel · line 17
Quoted 6 lines
(quoted diff) +1
-0inherit kernel +KERNEL_IMAGETYPE_alix = "bzImage" KERNEL_IMAGETYPE_progear = "bzImage" KERNEL_IMAGETYPE_simpad = "zImage" KERNEL_IMAGETYPE_kb9202 = "uImage"Should these not really go into the machine.conf files?
Quoted 5 lines
Right - I looked at it and prepared patch. It removes
KERNEL_IMAGETYPE= "zImage" entries from kernel recipes and also sets this variable into bzImage for x86 machines which already use that type of kernels. Rest of machines are untouched (yet) - I can convert them if we reach consensus about it.
Looks like a good start to me :)
Cheers,
Richard
Quoted 7 lines · Marcin Juszkiewicz
Right - I looked at it and prepared patch. It removes
KERNEL_IMAGETYPE= "zImage" entries from kernel recipes and also sets this variable into bzImage for x86 machines which already use that type of kernels. Rest of machines are untouched (yet) - I can convert them if we reach consensus about it.Please review and comment.
pushed
Signature · 4 lines
JID: hrw-jabber.org
OpenEmbedded developer/consultant
Computers are not intelligent. They only think they are.