[oe-commits] org.oe.dev merge of '4fec7547828d90c8b430bc08cb12a80b9091750b'
oe commit
oe at amethyst.openembedded.net
Tue Apr 1 10:22:54 UTC 2008
merge of '4fec7547828d90c8b430bc08cb12a80b9091750b'
and 'ee1c0d99f2549754c9cb3cf471c5d3e68e42087d'
Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 3a476b00537a64a6add8bd114705a5f82eb6eef4
ViewMTN: http://monotone.openembedded.org/revision/info/3a476b00537a64a6add8bd114705a5f82eb6eef4
Files:
1
classes/cpan.bbclass
packages/hostap/hostap-daemon-0.6.0
packages/hostap/hostap-daemon-0.6.3
packages/hostap/hostap-daemon_0.6.0.bb
packages/hostap/hostap-daemon_0.6.3.bb
packages/libpixman/libpixman_0.9.6.bb
packages/libpixman/libpixman_0.10.0.bb
packages/gnuradio/gnuradio-3.1.2
packages/sdcc/sdcc-2.8.0
contrib/mtn2git/update-script.example
packages/abiword/abiword-plugins_2.6.0.bb
packages/abiword/abiword_2.6.0.bb
packages/abiword/files/abiword-cxx-for-ld-fix.patch
packages/gnuradio/gnuradio-3.1.2/no-trellis-doc.patch
packages/gnuradio/gnuradio_3.1.2.bb
packages/sdcc/sdcc-2.8.0/use-native-tools.patch
packages/sdcc/sdcc-native_2.8.0.bb
packages/sdcc/sdcc_2.8.0.bb
classes/kernel.bbclass
packages/abiword/abiword-plugins_2.5.1.bb
packages/abiword/abiword-plugins_2.5.2.bb
packages/gnuradio/gnuradio.inc
packages/gnuradio/gnuradio_svn.bb
packages/linux/linux-rt_2.6.24.bb
packages/linux/linux.inc
packages/linux/linux_2.6.23+2.6.24-rc5.bb
packages/linux/linux_2.6.23.bb
packages/linux/linux_2.6.24.bb
packages/zaurus-updater/zaurus-updater.bb
Diffs:
#
# mt diff -r4fec7547828d90c8b430bc08cb12a80b9091750b -r3a476b00537a64a6add8bd114705a5f82eb6eef4
#
#
#
# patch "classes/cpan.bbclass"
# from [7a1ee7c60006de5f1fdeedf6a41459c55b0a894e]
# to [37cd3844dffec6f7c9516f2353be95eda9f98c1a]
#
============================================================
--- classes/cpan.bbclass 7a1ee7c60006de5f1fdeedf6a41459c55b0a894e
+++ classes/cpan.bbclass 37cd3844dffec6f7c9516f2353be95eda9f98c1a
@@ -50,13 +50,13 @@ cpan_do_install () {
}
cpan_do_install () {
- if [ ${@is_target(d)} == "yes" ]; then
+ if [ ${@is_target(d)} = "yes" ]; then
oe_runmake install_vendor
fi
}
cpan_do_stage () {
- if [ ${@is_target(d)} == "no" ]; then
+ if [ ${@is_target(d)} = "no" ]; then
oe_runmake install_vendor
fi
}
#
# mt diff -ree1c0d99f2549754c9cb3cf471c5d3e68e42087d -r3a476b00537a64a6add8bd114705a5f82eb6eef4
#
#
#
# rename "packages/hostap/hostap-daemon-0.6.0"
# to "packages/hostap/hostap-daemon-0.6.3"
#
# rename "packages/hostap/hostap-daemon_0.6.0.bb"
# to "packages/hostap/hostap-daemon_0.6.3.bb"
#
# rename "packages/libpixman/libpixman_0.9.6.bb"
# to "packages/libpixman/libpixman_0.10.0.bb"
#
# add_dir "packages/gnuradio/gnuradio-3.1.2"
#
# add_dir "packages/sdcc/sdcc-2.8.0"
#
# add_file "contrib/mtn2git/update-script.example"
# content [9f8caa85b400e9a7af49d8714a42648ffc346027]
#
# add_file "packages/abiword/abiword-plugins_2.6.0.bb"
# content [08cb74f7ccc32068a49834d218b474e7f487b3d5]
#
# add_file "packages/abiword/abiword_2.6.0.bb"
# content [e1a10b5275d12dca63a83d0c19b8277c9cd110ea]
#
# add_file "packages/abiword/files/abiword-cxx-for-ld-fix.patch"
# content [273f436489f287d13297340c5a6475232a4f933e]
#
# add_file "packages/gnuradio/gnuradio-3.1.2/no-trellis-doc.patch"
# content [072034ad536d8d56f377a4eaf7757fddbc7f86fc]
#
# add_file "packages/gnuradio/gnuradio_3.1.2.bb"
# content [e935ec6d343e8fdb415db8992f198c118b3780af]
#
# add_file "packages/libpixman/libpixman_0.9.6.bb"
# content [6058783591b5e89abad921c75fba92e49effa18c]
#
# add_file "packages/sdcc/sdcc-2.8.0/use-native-tools.patch"
# content [ee119cc69f4ca9df4d8592453bfe90bcf68b8c17]
#
# add_file "packages/sdcc/sdcc-native_2.8.0.bb"
# content [deceb5882dbe288232fde80041786a1bffec1a69]
#
# add_file "packages/sdcc/sdcc_2.8.0.bb"
# content [366906abfdd83eba56b9ad771c69484ab0468986]
#
# patch "classes/kernel.bbclass"
# from [56eee918e2285b8298e9e2feecc353c0723683aa]
# to [a2023556ff7f2b754b62219b795ef6bf47185281]
#
# patch "packages/abiword/abiword-plugins_2.5.1.bb"
# from [62e4936aba824f0155caa54f5911ce2750c5a7ae]
# to [80bb349de2e542daecc78e094218894b5f117405]
#
# patch "packages/abiword/abiword-plugins_2.5.2.bb"
# from [b02d055a699a18d721d373c5bcbe26e5d8a5f882]
# to [156bd16e63ca8fba3be27dade721ca7936fbd5cf]
#
# patch "packages/gnuradio/gnuradio.inc"
# from [3f1b2b5f3c69879f89afcc926dccabf8d0e5d5fe]
# to [f3784a8b6e3c9fcbccabd3014638b35285a1adba]
#
# patch "packages/gnuradio/gnuradio_svn.bb"
# from [60afef07fd78cf20eec7eaec38e79318fa6ec205]
# to [c208d7c99e0267f8380bd0efe7d3d2bffdfb6247]
#
# patch "packages/linux/linux-rt_2.6.24.bb"
# from [29d97acddf75b09d01099358d07240db5d4e2353]
# to [108bbff7661bc9d0a62d80e522cfb37313ce823c]
#
# patch "packages/linux/linux.inc"
# from [0196432d82c97552c01b010a212e24c2a8b0016a]
# to [7bf95936e9aa2c19910b87746edc070ad1cdbea5]
#
# patch "packages/linux/linux_2.6.23+2.6.24-rc5.bb"
# from [8cef3230be1ba924b6e2c80492f1092a17566910]
# to [801134850169bd093cb2c9401f2e93bbd3acc903]
#
# patch "packages/linux/linux_2.6.23.bb"
# from [2440043a73616ef8837486eec4d51aa891d62868]
# to [6991c88082897d8ca8c8f3777423bdb092b34a0b]
#
# patch "packages/linux/linux_2.6.24.bb"
# from [4eabbe972f1ffeca4ea26e4d897079e1542a5624]
# to [1698797d4e832dd0ac53b480d89c620c02d4add1]
#
# patch "packages/zaurus-updater/zaurus-updater.bb"
# from [6e0132a319145e0bee0939723f38518cc48760b8]
# to [2b959c7a89c5e81e41024dbd651be2f09998f09e]
#
============================================================
--- contrib/mtn2git/update-script.example 9f8caa85b400e9a7af49d8714a42648ffc346027
+++ contrib/mtn2git/update-script.example 9f8caa85b400e9a7af49d8714a42648ffc346027
@@ -0,0 +1,32 @@
+#!/bin/bash
+
+export PATH=/home/zecke/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games
+
+cd $HOME/mtn2git-scm/oe-convert/
+
+# Update monotone
+mtn --db ../OE.mtn pull monotone.linuxtogo.org "org.openembedded.*"
+
+OLD_OE_DIR=openembedded-git.$$.$RANDOM
+
+git-clone -l openembedded-git $OLD_OE_DIR
+cp git-import-marks2 $OLD_OE_DIR/
+cp mtn2git-status.v2 $OLD_OE_DIR/
+cp mtn2git-marks $OLD_OE_DIR/
+
+cd openembedded-git
+# Convert (this could fail as our marks are not complete...) and we hardcode the revision
+#../../mtn2git/mtn2git.py --db ../../OE.mtn --marks=../mtn2git-marks --status=../mtn2git-status.v2 2> /dev/null | git-fast-import --date-format=rfc2822 --import-marks=../git-import-marks2 --export-marks=../git-import-marks2
+../../mtn2git/mtn2git.py --db ../../OE.mtn --marks=../mtn2git-marks --status=../mtn2git-status.v2 | git-fast-import --date-format=rfc2822 --import-marks=../git-import-marks2 --export-marks=../git-import-marks2
+
+
+
+# Push all changes to the server, update the master tag as well
+for branch in dev dreambox documentation oetest oz354x packaged-staging oz354fam083 angstrom-2007.12-stable entity stable;
+do
+ git-push --force git+ssh://ABC@repo.or.cz/srv/git/org.openembedded.dev.git org.openembedded.$branch;
+done
+
+#dev is our master
+git-push --force git+ssh://ABC@repo.or.cz/srv/git/org.openembedded.dev.git org.openembedded.dev:master;
+
============================================================
--- packages/abiword/abiword-plugins_2.6.0.bb 08cb74f7ccc32068a49834d218b474e7f487b3d5
+++ packages/abiword/abiword-plugins_2.6.0.bb 08cb74f7ccc32068a49834d218b474e7f487b3d5
@@ -0,0 +1,44 @@
+DESCRIPTION = "AbiWord is a free word processing program similar to Microsoft(r) Word"
+HOMEPAGE = "http://www.abiword.org"
+SECTION = "x11/office"
+LICENSE = "GPLv2"
+DEPENDS = "boost loudmouth libwpd librsvg goffice poppler libglade"
+RDEPENDS = "abiword"
+
+SRC_URI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-plugins-${PV}.tar.gz \
+ http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz \
+ file://abiword-cxx-for-ld-fix.patch;patch=1 \
+ "
+
+DEFAULT_PREFERENCE = "2"
+
+inherit autotools
+
+PARALLEL_MAKE=""
+
+# Ugly hack to find libstdc++
+export LD="${CXX}"
+
+EXTRA_OECONF = " --without-libwmf \
+ --without-inter7eps \
+ --with-abiword=${WORKDIR}/abiword-${PV} \
+ --with-boost=${STAGING_DIR_HOST} \
+ --with-boost-thread=boost_thread-mt \
+ "
+
+PACKAGES_DYNAMIC = "abiword-plugin-*"
+
+python populate_packages_prepend () {
+ abiword_libdir = bb.data.expand('${libdir}/abiword-2.6/plugins', d)
+ do_split_packages(d, abiword_libdir, '^libAbi(.*)\.so$', 'abiword-plugin-%s', 'Abiword plugin for %s', extra_depends='')
+ do_split_packages(d, abiword_libdir, '^libAbi(.*)\.la$', 'abiword-plugin-%s-dev', 'Abiword plugin for %s', extra_depends='')
+}
+
+
+PACKAGES =+ "abiword-plugin-collab-glade"
+
+FILES_abiword-plugin-collab-glade += "${datadir}"
+RDEPENDS_abiword-plugin-collab-glade = "abiword-plugin-collab"
+
+FILES_${PN}-dbg += "${libdir}/abiword-2.6/plugins/.debug"
+
============================================================
--- packages/abiword/abiword_2.6.0.bb e1a10b5275d12dca63a83d0c19b8277c9cd110ea
+++ packages/abiword/abiword_2.6.0.bb e1a10b5275d12dca63a83d0c19b8277c9cd110ea
@@ -0,0 +1,3 @@
+require abiword-2.5.inc
+
+RCONFLICTS = "abiword-embedded"
============================================================
--- packages/abiword/files/abiword-cxx-for-ld-fix.patch 273f436489f287d13297340c5a6475232a4f933e
+++ packages/abiword/files/abiword-cxx-for-ld-fix.patch 273f436489f287d13297340c5a6475232a4f933e
@@ -0,0 +1,12 @@
+libstc++ isn't in staging anymore, so we must use g++ for linking
+
+--- /tmp/configure.ac 2008-03-31 11:39:13.130631737 +0200
++++ abiword-plugins-2.6.0/configure.ac 2008-03-31 11:39:22.754586487 +0200
+@@ -14,6 +14,7 @@
+ AC_PROG_INSTALL
+ AC_PROG_LN_S
+ AC_PROG_MAKE_SET
++AC_LANG_CPLUSPLUS
+
+ AM_INIT_AUTOMAKE
+
============================================================
--- packages/gnuradio/gnuradio-3.1.2/no-trellis-doc.patch 072034ad536d8d56f377a4eaf7757fddbc7f86fc
+++ packages/gnuradio/gnuradio-3.1.2/no-trellis-doc.patch 072034ad536d8d56f377a4eaf7757fddbc7f86fc
@@ -0,0 +1,20 @@
+--- /tmp/Makefile.am 2008-04-01 10:50:58.848945668 +0200
++++ gnuradio-3.1.2/usrp/Makefile.am 2008-04-01 10:51:06.095612812 +0200
+@@ -24,7 +24,7 @@
+ usrp.iss.in \
+ usrp.inf
+
+-SUBDIRS = host firmware fpga doc
++SUBDIRS = host firmware fpga
+
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = \
+--- /tmp/Makefile.am 2008-04-01 10:52:10.615605452 +0200
++++ gnuradio-3.1.2/gr-trellis/Makefile.am 2008-04-01 10:52:19.807923018 +0200
+@@ -21,5 +21,5 @@
+
+ include $(top_srcdir)/Makefile.common
+
+-SUBDIRS = src doc
++SUBDIRS = src
+
============================================================
--- packages/gnuradio/gnuradio_3.1.2.bb e935ec6d343e8fdb415db8992f198c118b3780af
+++ packages/gnuradio/gnuradio_3.1.2.bb e935ec6d343e8fdb415db8992f198c118b3780af
@@ -0,0 +1,8 @@
+require gnuradio.inc
+
+PR = "r0"
+
+SRC_URI = "ftp://ftp.gnu.org/gnu/gnuradio/gnuradio-${PV}.tar.gz \
+ file://no-trellis-doc.patch;patch=1 \
+ "
+
============================================================
--- packages/libpixman/libpixman_0.9.6.bb 6058783591b5e89abad921c75fba92e49effa18c
+++ packages/libpixman/libpixman_0.9.6.bb 6058783591b5e89abad921c75fba92e49effa18c
@@ -0,0 +1,13 @@
+SECTION = "libs"
+PRIORITY = "optional"
+DESCRIPTION = "Low-level pixel manipulation library."
+LICENSE = "X11"
+SRC_URI = "http://cairographics.org/releases/pixman-${PV}.tar.gz"
+S = "${WORKDIR}/pixman-${PV}"
+
+inherit autotools pkgconfig
+
+do_stage () {
+ autotools_stage_all
+}
+
============================================================
--- packages/sdcc/sdcc-2.8.0/use-native-tools.patch ee119cc69f4ca9df4d8592453bfe90bcf68b8c17
+++ packages/sdcc/sdcc-2.8.0/use-native-tools.patch ee119cc69f4ca9df4d8592453bfe90bcf68b8c17
@@ -0,0 +1,129 @@
+diff -Nurd sdcc.orig/device/lib/Makefile.in sdcc/device/lib/Makefile.in
+--- sdcc.orig/device/lib/Makefile.in 2007-06-03 22:38:18.000000000 +0200
++++ sdcc/device/lib/Makefile.in 2008-04-01 10:05:17.352552206 +0200
+@@ -27,8 +27,8 @@
+ PORTINCDIR = $(INCDIR)/mcs51
+ endif
+
+-CC = $(top_builddir)/bin/sdcc
+-CPP = $(top_builddir)/bin/sdcpp
++CC = sdcc
++CPP = sdcpp
+
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+diff -Nurd sdcc.orig/device/lib/ds390/Makefile.in sdcc/device/lib/ds390/Makefile.in
+--- sdcc.orig/device/lib/ds390/Makefile.in 2007-06-03 22:38:18.000000000 +0200
++++ sdcc/device/lib/ds390/Makefile.in 2008-04-01 10:06:23.287688808 +0200
+@@ -1,7 +1,7 @@
+ VPATH = @srcdir@
+ srcdir = @srcdir@
+
+-CC = ../../../bin/sdcc
++CC = sdcc
+
+ #VERBOSE = --verbose
+
+diff -Nurd sdcc.orig/device/lib/ds400/Makefile.in sdcc/device/lib/ds400/Makefile.in
+--- sdcc.orig/device/lib/ds400/Makefile.in 2007-06-03 22:38:18.000000000 +0200
++++ sdcc/device/lib/ds400/Makefile.in 2008-04-01 10:06:44.282796254 +0200
+@@ -1,4 +1,4 @@
+-CC = ../../../bin/sdcc
++CC = sdcc
+
+ VPATH = @srcdir@
+ srcdir = @srcdir@
+diff -Nurd sdcc.orig/device/lib/gbz80/Makefile.in sdcc/device/lib/gbz80/Makefile.in
+--- sdcc.orig/device/lib/gbz80/Makefile.in 2007-04-18 21:56:32.000000000 +0200
++++ sdcc/device/lib/gbz80/Makefile.in 2008-04-01 10:07:40.539249456 +0200
+@@ -5,8 +5,8 @@
+
+ TOPDIR = ../../..
+
+-SCC = $(TOPDIR)/bin/sdcc -mgbz80
+-SAS = $(TOPDIR)/bin/as-gbz80
++SCC = sdcc -mgbz80
++SAS = as-gbz80
+
+ OBJ = div.o mul.o putchar.o printf.o shift.o stubs.o crt0_rle.o heap.o fstubs.o
+
+diff -Nurd sdcc.orig/device/lib/hc08/Makefile.in sdcc/device/lib/hc08/Makefile.in
+--- sdcc.orig/device/lib/hc08/Makefile.in 2007-04-18 21:56:32.000000000 +0200
++++ sdcc/device/lib/hc08/Makefile.in 2008-04-01 10:09:20.336580262 +0200
+@@ -5,8 +5,8 @@
+
+ TOPDIR = ../../..
+
+-SCC = $(TOPDIR)/bin/sdcc -mhc08
+-SAS = $(TOPDIR)/bin/as6808
++SCC = sdcc -mhc08
++SAS = as6808
+
+ OBJ = _ret.rel _divuint.rel _divulong.rel _mulint.rel _mullong.rel
+
+diff -Nurd sdcc.orig/device/lib/mcs51/Makefile.in sdcc/device/lib/mcs51/Makefile.in
+--- sdcc.orig/device/lib/mcs51/Makefile.in 2007-04-18 21:56:32.000000000 +0200
++++ sdcc/device/lib/mcs51/Makefile.in 2008-04-01 10:05:53.603952030 +0200
+@@ -4,8 +4,8 @@
+ top_srcdir = @top_srcdir@
+ top_builddir = @top_builddir@
+
+-SAS = $(top_builddir)/bin/asx8051
+-SCC = $(top_builddir)/bin/sdcc
++SAS = asx8051
++SCC = sdcc
+
+ OBJ = crtstart.rel crtxinit.rel crtxclear.rel crtclear.rel crtxstack.rel \
+ crtpagesfr.rel crtbank.rel crtcall.rel
+diff -Nurd sdcc.orig/device/lib/pic/Makefile.common.in sdcc/device/lib/pic/Makefile.common.in
+--- sdcc.orig/device/lib/pic/Makefile.common.in 2007-05-05 09:41:17.000000000 +0200
++++ sdcc/device/lib/pic/Makefile.common.in 2008-04-01 10:10:10.375857197 +0200
+@@ -68,8 +68,8 @@
+
+ #################################################
+ ### programs to use
+-CPP = $(top_builddir)/../../../bin/sdcpp
+-CC = $(top_builddir)/../../../bin/sdcc
++CPP = sdcpp
++CC = sdcc
+ AS = @GPASM@
+ LD = @GPLINK@
+ LIB = @GPLIB@
+diff -Nurd sdcc.orig/device/lib/z80/Makefile.in sdcc/device/lib/z80/Makefile.in
+--- sdcc.orig/device/lib/z80/Makefile.in 2007-04-18 21:56:32.000000000 +0200
++++ sdcc/device/lib/z80/Makefile.in 2008-04-01 10:07:15.147644058 +0200
+@@ -5,8 +5,8 @@
+
+ TOPDIR = ../../..
+
+-SCC = $(TOPDIR)/bin/sdcc -mz80
+-SAS = $(TOPDIR)/bin/as-z80
++SCC = sdcc -mz80
++SAS = as-z80
+
+ OBJ = div.o mul.o putchar.o shift.o stubs.o crt0_rle.o heap.o fstubs.o
+
+diff -Nurd sdcc.orig/support/regression/Makefile.in sdcc/support/regression/Makefile.in
+--- sdcc.orig/support/regression/Makefile.in 2008-02-21 19:51:18.000000000 +0100
++++ sdcc/support/regression/Makefile.in 2008-04-01 10:08:38.665755305 +0200
+@@ -155,7 +155,7 @@
+
+ # Defaults. Override in spec.mk if required.
+ # Path to SDCC
+-SDCC = $(top_builddir)/bin/sdcc
++SDCC = sdcc
+ # Base flags.
+ SDCCFLAGS += --fverbose-asm -DNO_VARARGS
+ # Extension of object intermediate files
+diff -Nurd sdcc.orig/support/tests/dhrystone/Makefile sdcc/support/tests/dhrystone/Makefile
+--- sdcc.orig/support/tests/dhrystone/Makefile 2001-10-22 03:14:16.000000000 +0200
++++ sdcc/support/tests/dhrystone/Makefile 2008-04-01 10:08:55.786456870 +0200
+@@ -3,7 +3,7 @@
+
+ PROC = z80
+
+-CC = $(TOPDIR)/bin/sdcc
++CC = sdcc
+
+ # -DNOENUM is here to make the results more predictable
+ CFLAGS += -DREG= -DNOSTRUCTASSIGN -DNOENUM -V -m$(PROC) --profile --dumpall --stack-auto
============================================================
--- packages/sdcc/sdcc-native_2.8.0.bb deceb5882dbe288232fde80041786a1bffec1a69
+++ packages/sdcc/sdcc-native_2.8.0.bb deceb5882dbe288232fde80041786a1bffec1a69
@@ -0,0 +1,16 @@
+require sdcc_${PV}.bb
+inherit native
+DEPENDS = ""
+
+# don't need native-tools patch here
+SRC_URI = "${SOURCEFORGE_MIRROR}/sdcc/sdcc-src-${PV}.tar.bz2 \
+ "
+
+do_stage() {
+ oe_runmake install
+}
+
+#do_stage() {
+# find bin -type f -perm -0755 -exec install -m 0755 {} ${STAGING_BINDIR} \;
+#}
+
============================================================
--- packages/sdcc/sdcc_2.8.0.bb 366906abfdd83eba56b9ad771c69484ab0468986
+++ packages/sdcc/sdcc_2.8.0.bb 366906abfdd83eba56b9ad771c69484ab0468986
@@ -0,0 +1,21 @@
+DESCRIPTION= "SDCC - Small Device C Compiler"
+LICENSE = "GPL"
+SECTION = "devel"
+HOMEPAGE = "http://sdcc.sourceforge.net"
+DEPENDS = "sdcc-native"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/sdcc/sdcc-src-${PV}.tar.bz2 \
+ file://use-native-tools.patch;patch=1"
+
+S = "${WORKDIR}/sdcc"
+
+PARALLEL_MAKE = ""
+
+inherit autotools
+
+
+do_configure() {
+ gnu-configize
+ oe_runconf
+}
+
============================================================
--- classes/kernel.bbclass 56eee918e2285b8298e9e2feecc353c0723683aa
+++ classes/kernel.bbclass a2023556ff7f2b754b62219b795ef6bf47185281
@@ -463,8 +463,8 @@ addtask sizecheck before do_install afte
addtask sizecheck before do_install after do_compile
-KERNEL_IMAGE_BASE_NAME = "${KERNEL_IMAGETYPE}-${PV}-${PR}-${MACHINE}-${DATETIME}"
-KERNEL_IMAGE_SYMLINK_NAME = "${KERNEL_IMAGETYPE}-${MACHINE}"
+KERNEL_IMAGE_BASE_NAME ?= "${KERNEL_IMAGETYPE}-${PV}-${PR}-${MACHINE}"
+KERNEL_IMAGE_SYMLINK_NAME ?= "${KERNEL_IMAGETYPE}-${MACHINE}"
do_deploy() {
install -d ${DEPLOY_DIR_IMAGE}
@@ -475,22 +475,22 @@ do_deploy() {
if test "x${KERNEL_IMAGETYPE}" = "xuImage" ; then
if test -e arch/${ARCH}/boot/compressed/vmlinux ; then
${OBJCOPY} -O binary -R .note -R .comment -S arch/${ARCH}/boot/compressed/vmlinux linux.bin
- uboot-mkimage -A ${UBOOT_ARCH} -O linux -T kernel -C none -a ${UBOOT_LOADADDRESS} -e ${UBOOT_ENTRYPOINT} -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE}.bin
+ uboot-mkimage -A ${UBOOT_ARCH} -O linux -T kernel -C none -a ${UBOOT_LOADADDRESS} -e %s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list