[oe-commits] org.oe.dev merge of '297ad7b94e8bbe83dfdc4147df98885ce3617e76'
xjqian commit
openembedded-commits at lists.openembedded.org
Sun Feb 24 18:05:28 UTC 2008
merge of '297ad7b94e8bbe83dfdc4147df98885ce3617e76'
and '6678db7afc1756949a7d7e0c29814b8ba5988e74'
Author: xjqian at openembedded.org
Branch: org.openembedded.dev
Revision: 59ce37a790d228173cde1a9b4f8202e5665345db
ViewMTN: http://monotone.openembedded.org/revision/info/59ce37a790d228173cde1a9b4f8202e5665345db
Files:
1
packages/ffmpeg/ffmpeg.inc
packages/ffmpeg/ffmpeg_0.4.9-pre1.bb
packages/ffmpeg/ffmpeg_svn.bb
packages/altboot/altboot_1.1.1+wip-SVNR79.bb
packages/altboot/altboot_1.1.1+wip-SVNR80.bb
packages/klibc/files/staging.patch
packages/klibc/klibc-utils-static_1.5.bb
packages/klibc/klibc.inc
packages/klibc/klibc_1.5.bb
packages/ttf-fonts/ttf-hunkyfonts_0.3.0.bb
packages/ttf-fonts/ttf-liberation_0.2.bb
packages/ttf-fonts/ttf-sazanami_20040629.bb
packages/xorg-xserver/xserver-kdrive-imageon_1.2.0.bb
Diffs:
#
# mt diff -r297ad7b94e8bbe83dfdc4147df98885ce3617e76 -r59ce37a790d228173cde1a9b4f8202e5665345db
#
#
#
# patch "packages/ffmpeg/ffmpeg.inc"
# from [74e136608c8bb3130afc1af896150031726472c0]
# to [84044f7d06812f97708d5aaf10e1e260f0a1dda0]
#
# patch "packages/ffmpeg/ffmpeg_0.4.9-pre1.bb"
# from [204fc94bcae002b164372234b0291b302e3a5307]
# to [c3572c18ab65a446d322a3902f88912447563717]
#
# patch "packages/ffmpeg/ffmpeg_svn.bb"
# from [0ddf51c0c1f64b7d633cd541ce950ce8db509a71]
# to [a88f11ff93c4722033c395383b54f840896271a4]
#
============================================================
--- packages/ffmpeg/ffmpeg.inc 74e136608c8bb3130afc1af896150031726472c0
+++ packages/ffmpeg/ffmpeg.inc 84044f7d06812f97708d5aaf10e1e260f0a1dda0
@@ -1,39 +1,35 @@
-DESCRIPTION = "ffmpeg"
+DESCRIPTION = "FFmpeg is a complete solution to record, convert and stream audio and video"
HOMEPAGE = "http://ffmpeg.mplayerhq.hu/"
AUTHOR = "Fabrice Bellard ffmpeg-devel at mplayerhq.hu"
SECTION = "libs"
PRIORITY = "optional"
LICENSE = "LGPL"
-DEPENDS = "zlib libvorbis faac liba52 lame"
+DEPENDS = "zlib libogg libvorbis faac faad2 liba52 lame"
RSUGGESTS = "mplayer"
inherit autotools pkgconfig
-TARGET_LDFLAGS_append = " -lm -la52 "
+LEAD_SONAME = "libavcodec.so"
EXTRA_OECONF = "\
+ \
--enable-pp \
--enable-shared \
--enable-pthreads \
--enable-gpl \
\
- --disable-audio-beos \
- --disable-v4l \
- --disable-dv1394 \
+ --cross-prefix=${TARGET_PREFIX} \
--disable-debug \
--disable-ffserver \
--disable-ffplay \
\
- --cross-prefix=${TARGET_PREFIX} \
- \
- --cpu=${PACKAGE_ARCH} \
- \
"
-# We do this because the install program is called with -s which causes it to call "strip" and it then mangles cross compiled stuff..
-PATH_prepend="${CROSS_DIR}/${TARGET_SYS}/bin:"
+PACKAGES += "${PN}-vhook-dbg ${PN}-vhook"
+FILES_${PN} = "${bindir}"
+FILES_${PN}-dev = "${includedir}/${PN}"
+
+FILES_${PN}-vhook = "${libdir}/vhook"
+FILES_${PN}-vhook-dbg += "${libdir}/vhook/.debug"
-do_configure_prepend() {
- export CC="${CC}"
-}
============================================================
--- packages/ffmpeg/ffmpeg_0.4.9-pre1.bb 204fc94bcae002b164372234b0291b302e3a5307
+++ packages/ffmpeg/ffmpeg_0.4.9-pre1.bb c3572c18ab65a446d322a3902f88912447563717
@@ -1,16 +1,18 @@ require ffmpeg.inc
require ffmpeg.inc
-DEPENDS += "faad2"
+PR = "r3"
-PR = "r2"
-
SRC_URI = "${SOURCEFORGE_MIRROR}/ffmpeg/ffmpeg-${PV}.tar.gz \
- file://configure.patch;patch=0 \
- file://gcc4.patch;patch=1 \
- file://soname.patch;patch=1 \
- "
+ file://configure.patch;patch=0 \
+ file://gcc4.patch;patch=1 \
+ file://soname.patch;patch=1 \
+ "
EXTRA_OECONF += " \
+ \
+ --prefix=${D}${prefix} \
+ --mandir=${D}${prefix}/share/man \
+ \
--enable-mp3lame \
--enable-vorbis \
--enable-faad \
@@ -22,39 +24,37 @@ EXTRA_OECONF += " \
--disable-amr_nb \
--enable-amr_nb-fixed \
--disable-amr_wb \
- --enable-zlib \
\
+ --cpu=${TARGET_ARCH} \
+ --tune=${PACKAGE_ARCH} \
+ --extra-ldflags="-la52" \
\
- --extra-cflags=\$(TARGET_CFLAGS) \
- --extra-ldflags=\$(TARGET_LDFLAGS) \
- --extra-libs=\$(TARGET_LDFLAGS) \
- \
- --prefix=${D}${prefix} \
- --mandir=${D}${prefix}/share/man \
+ --disable-audio-beos \
+ --disable-v4l \
+ --disable-dv1394 \
"
-PACKAGES += "libavcodec libavcodec-dev libavformat libavformat-dev"
-
-FILES_${PN} += "${libdir}/vhook"
-FILES_${PN}-dev = "${includedir}"
-FILES_${PN}-dbg += "${libdir}/vhook/.debug"
-
-FILES_libavcodec = "${libdir}/libavcodec*.so.*"
-FILES_libavcodec-dev = "${libdir}/libavcodec*.so ${libdir}/libavcodec*.la ${libdir}/libavcodec*.a"
-FILES_libavformat = "${libdir}/libavformat*.so.*"
-FILES_libavformat-dev = "${libdir}/libavformat*.so ${libdir}/libavformat*.la ${libdir}/libavformat*.a"
-
do_stage() {
- oe_libinstall -a -so -C libavcodec libavcodec ${STAGING_LIBDIR}
+ oe_libinstall -a -so -C libavcodec libavcodec ${STAGING_LIBDIR}
oe_libinstall -a -so -C libavformat libavformat ${STAGING_LIBDIR}
install -d ${STAGING_INCDIR}/ffmpeg
- install -m 0644 ${S}/libavcodec/avcodec.h ${STAGING_INCDIR}/ffmpeg/avcodec.h
- install -m 0644 ${S}/libavcodec/common.h ${STAGING_INCDIR}/ffmpeg/common.h
+
+ install -m 0644 ${S}/libavcodec/avcodec.h ${STAGING_INCDIR}/ffmpeg/avcodec.h
+ install -m 0644 ${S}/libavcodec/common.h ${STAGING_INCDIR}/ffmpeg/common.h
install -m 0644 ${S}/libavcodec/rational.h ${STAGING_INCDIR}/ffmpeg/rational.h
- install -m 0644 ${S}/libavformat/avformat.h ${STAGING_INCDIR}/ffmpeg/avformat.h
- install -m 0644 ${S}/libavformat/avio.h ${STAGING_INCDIR}/ffmpeg/avio.h
- install -m 0644 ${S}/libavformat/rtp.h ${STAGING_INCDIR}/ffmpeg/rtp.h
- install -m 0644 ${S}/libavformat/rtsp.h ${STAGING_INCDIR}/ffmpeg/rtsp.h
+
+ install -m 0644 ${S}/libavformat/avformat.h ${STAGING_INCDIR}/ffmpeg/avformat.h
+ install -m 0644 ${S}/libavformat/avio.h ${STAGING_INCDIR}/ffmpeg/avio.h
+ install -m 0644 ${S}/libavformat/rtp.h ${STAGING_INCDIR}/ffmpeg/rtp.h
+ install -m 0644 ${S}/libavformat/rtsp.h ${STAGING_INCDIR}/ffmpeg/rtsp.h
install -m 0644 ${S}/libavformat/rtspcodes.h ${STAGING_INCDIR}/ffmpeg/rtspcodes.h
}
+
+PACKAGES += "libavcodec libavcodec-dev \
+ libavformat libavformat-dev"
+
+FILES_libavcodec = "${libdir}/libavcodec*.so.*"
+FILES_libavcodec-dev = "${libdir}/libavcodec*.so"
+FILES_libavformat = "${libdir}/libavformat*.so.*"
+FILES_libavformat-dev = "${libdir}/libavformat*.so"
============================================================
--- packages/ffmpeg/ffmpeg_svn.bb 0ddf51c0c1f64b7d633cd541ce950ce8db509a71
+++ packages/ffmpeg/ffmpeg_svn.bb a88f11ff93c4722033c395383b54f840896271a4
@@ -1,9 +1,9 @@ require ffmpeg.inc
require ffmpeg.inc
-DEPENDS += "libogg"
+DEPENDS += "libgsm"
-PV = "0.4.9+svnr${SRCREV}"
-PR = "r2"
+PV = "0.4.9+svn${SRCDATE}"
+PR = "r3"
DEFAULT_PREFERENCE = "-1"
@@ -12,118 +12,94 @@ EXTRA_OECONF += " \
S = "${WORKDIR}/trunk"
EXTRA_OECONF += " \
- --enable-libmp3lame \
- --enable-libvorbis \
- --disable-libfaad \
+ --prefix=/usr \
+ \
+ --enable-nonfree \
+ --enable-swscaler \
+ --enable-x11grab \
+ \
--enable-liba52 \
--enable-liba52bin \
- --enable-libogg \
- --enable-gpl \
+ --enable-libfaac \
+ --enable-libfaad \
+ --enable-libfaadbin \
+ --enable-libgsm \
+ --enable-libmp3lame \
+ --enable-libvorbis \
\
- --disable-strip \
- \
- \
- --cpu=${PACKAGE_ARCH} \
- --arch=${PACKAGE_ARCH} \
+ --arch=${TARGET_ARCH} \
+ --cross-compile \
+ --cc="gcc ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" \
+ --extra-cflags="${TARGET_CFLAGS}" \
+ --extra-ldflags="${TARGET_LDFLAGS}" \
+ --enable-hardcoded-tables \
"
-oe_runconf () {
- # make ffmpeg detect arm targets that don't end in 'l'
- sed -i -e s:'armv\[4567\]\*l':'armv\[4567\]\*':g ${S}/configure
- if [ -x ${S}/configure ] ; then
- cfgcmd="${S}/configure \
- --prefix=${prefix} \
- --mandir=${mandir} \
- ${EXTRA_OECONF} \
- $@"
- oenote "Running $cfgcmd..."
- $cfgcmd || oefatal "oe_runconf failed"
- else
- oefatal "no configure script found"
- fi
-
+do_configure() {
+ ${S}/configure ${EXTRA_OECONF}
}
do_stage() {
- oe_libinstall -a -so -C libavcodec libavcodec ${STAGING_LIBDIR}
- oe_libinstall -a -so -C libavdevice libavdevice ${STAGING_LIBDIR}
- oe_libinstall -a -so -C libavformat libavformat ${STAGING_LIBDIR}
- oe_libinstall -a -so -C libavutil libavutil ${STAGING_LIBDIR}
- oe_libinstall -a -so -C libpostproc libpostproc ${STAGING_LIBDIR}
+ for lib in libavcodec libavdevice libavformat \
+ libavutil libpostproc libswscale
+ do
+ oe_libinstall -a -so -C $lib $lib ${STAGING_LIBDIR}
+ done
install -d ${STAGING_INCDIR}/ffmpeg
- install -m 0644 ${S}/libavcodec/avcodec.h \
- ${STAGING_INCDIR}/ffmpeg/avcodec.h
- install -m 0644 ${S}/libavdevice/avdevice.h \
- ${STAGING_INCDIR}/ffmpeg/avdevice.h
- install -m 0644 ${S}/libavformat/avformat.h \
- ${STAGING_INCDIR}/ffmpeg/avformat.h
- install -m 0644 ${S}/libavformat/avio.h \
- ${STAGING_INCDIR}/ffmpeg/avio.h
- install -m 0644 ${S}/libavformat/rtp.h \
- ${STAGING_INCDIR}/ffmpeg/rtp.h
- install -m 0644 ${S}/libavformat/rtsp.h \
- ${STAGING_INCDIR}/ffmpeg/rtsp.h
- install -m 0644 ${S}/libavformat/rtspcodes.h \
- ${STAGING_INCDIR}/ffmpeg/rtspcodes.h
- install -m 0644 ${S}/libavutil/avutil.h \
- ${STAGING_INCDIR}/ffmpeg/avutil.h
- install -m 0644 ${S}/libavutil/bswap.h \
- ${STAGING_INCDIR}/ffmpeg/bswap.h
- install -m 0644 ${S}/libavutil/common.h \
- ${STAGING_INCDIR}/ffmpeg/common.h
- install -m 0644 ${S}/libavutil/crc.h \
- ${STAGING_INCDIR}/ffmpeg/crc.h
- install -m 0644 ${S}/libavutil/integer.h \
- ${STAGING_INCDIR}/ffmpeg/integer.h
- install -m 0644 ${S}/libavutil/intfloat_readwrite.h \
- ${STAGING_INCDIR}/ffmpeg/intfloat_readwrite.h
- install -m 0644 ${S}/libavutil/mathematics.h \
- ${STAGING_INCDIR}/ffmpeg/mathematics.h
- install -m 0644 ${S}/libavutil/rational.h \
- ${STAGING_INCDIR}/ffmpeg/rational.h
- install -m 0644 ${S}/libavutil/mem.h \
- ${STAGING_INCDIR}/ffmpeg/mem.h
- install -m 0644 ${S}/libavutil/log.h \
- ${STAGING_INCDIR}/ffmpeg/log.h
+ install -m 0644 ${S}/libavcodec/avcodec.h ${STAGING_INCDIR}/ffmpeg/avcodec.h
+ install -m 0644 ${S}/libavcodec/opt.h ${STAGING_INCDIR}/ffmpeg/opt.h
+ install -m 0644 ${S}/libavdevice/avdevice.h ${STAGING_INCDIR}/ffmpeg/avdevice.h
+
+ for h in avformat.h avio.h rtp.h rtsp.h rtspcodes.h
+ do
+ install -m 0644 ${S}/libavformat/$h ${STAGING_INCDIR}/ffmpeg/$h
+ done
+
+ for h in adler32.h avstring.h avutil.h base64.h bswap.h \
+ common.h crc.h fifo.h integer.h intfloat_readwrite.h \
+ log.h lzo.h mathematics.h md5.h mem.h random.h \
+ rational.h sha1.h
+ do
+ install -m 0644 ${S}/libavutil/$h ${STAGING_INCDIR}/ffmpeg/$h
+ done
+
+ install -m 0644 ${S}/libswscale/swscale.h ${STAGING_INCDIR}/ffmpeg/swscale.h
+ install -m 0644 ${S}/libswscale/rgb2rgb.h ${STAGING_INCDIR}/ffmpeg/rgb2rgb.h
+
install -d ${STAGING_INCDIR}/libpostproc
- install -m 0644 ${S}/libpostproc/postprocess.h \
- ${STAGING_INCDIR}/libpostproc/postprocess.h
+ install -m 0644 ${S}/libpostproc/postprocess.h ${STAGING_INCDIR}/libpostproc/postprocess.h
}
-PACKAGES += "libavcodec libavcodec-dev \
- libavdevice libavdevice-dev \
- libavformat libavformat-dev \
- libavutil libavutil-dev \
- libpostproc libpostproc-dev"
+PACKAGES += "libavcodec libavcodec-dev libavcodec-dbg \
+ libavdevice libavdevice-dev libavdevice-dbg \
+ libavformat libavformat-dev libavformat-dbg \
+ libavutil libavutil-dev libavutil-dbg \
+ libpostproc libpostproc-dev libpostproc-dbg \
+ libswscale libswscale-dev libswscale-dbg"
-FILES_${PN} = "${bindir} ${libdir}/vhook"
-FILES_${PN}-dev += "${bindir} ${libdir}/pkgconfig/libswscale.pc"
-FILES_${PN}-doc = "${mandir}"
-
FILES_libavcodec = "${libdir}/libavcodec*.so.*"
-FILES_libavcodec-dev = "${libdir}/libavcodec*.so \
- ${libdir}/pkgconfig/libavcodec.pc \
- ${libdir}/libavcodec*.la ${libdir}/libavcodec*.a"
+FILES_libavcodec-dev = "${libdir}/libavcodec*.so ${libdir}/pkgconfig/libavcodec.pc ${libdir}/libavcodec*.a"
+FILES_libavcodec-dbg += "${libdir}/.debug/libavcodec*"
FILES_libavdevice = "${libdir}/libavdevice*.so.*"
-FILES_libavdevice-dev = "${libdir}/libavdevice*.so \
- ${libdir}/pkgconfig/libavdevice.pc \
- ${libdir}/libavdevice*.la ${libdir}/libavdevice*.a"
+FILES_libavdevice-dev = "${libdir}/libavdevice*.so ${libdir}/pkgconfig/libavdevice.pc ${libdir}/libavdevice*.a"
+FILES_libavdevice-dbg += "${libdir}/.debug/libavdevice*"
FILES_libavformat = "${libdir}/libavformat*.so.*"
-FILES_libavformat-dev = "${libdir}/libavformat*.so \
- ${libdir}/pkgconfig/libavformat.pc \
- ${libdir}/libavformat*.la ${libdir}/libavformat*.a"
+FILES_libavformat-dev = "${libdir}/libavformat*.so ${libdir}/pkgconfig/libavformat.pc ${libdir}/libavformat*.a"
+FILES_libavformat-dbg += "${libdir}/.debug/libavformat*"
FILES_libavutil = "${libdir}/libavutil*.so.*"
-FILES_libavutil-dev = "${libdir}/libavutil*.so \
- ${libdir}/pkgconfig/libavutil.pc \
- ${libdir}/libavutil*.la ${libdir}/libavutil*.a"
+FILES_libavutil-dev = "${libdir}/libavutil*.so ${libdir}/pkgconfig/libavutil.pc ${libdir}/libavutil*.a"
+FILES_libavutil-dbg += "${libdir}/.debug/libavutil*"
FILES_libpostproc = "${libdir}/libpostproc*.so.*"
+FILES_libpostproc-dev = "${libdir}/libpostproc*.so ${libdir}/pkgconfig/libpostproc.pc ${libdir}/libpostproc*.a ${includedir}/postproc"
+FILES_libpostproc-dbg += "${libdir}/.debug/libpostproc*"
+
+FILES_libswscale = "${libdir}/libswscale*.so.*"
+FILES_libswscale-dev = "${libdir}/libswscale*.so ${libdir}/pkgconfig/libswscale.pc ${libdir}/libswscale*.a"
+FILES_libswscale-dbg += "${libdir}/.debug/libswscale*"
-FILES_libpostproc-dev = "${libdir}/libpostproc*.so \
- ${libdir}/pkgconfig/libpostproc.pc \
- ${libdir}/libpostproc*.la ${libdir}/libpostproc*.a"
#
# mt diff -r6678db7afc1756949a7d7e0c29814b8ba5988e74 -r59ce37a790d228173cde1a9b4f8202e5665345db
#
#
#
# rename "packages/altboot/altboot_1.1.1+wip-SVNR79.bb"
# to "packages/altboot/altboot_1.1.1+wip-SVNR80.bb"
#
# patch "packages/altboot/altboot_1.1.1+wip-SVNR80.bb"
# from [92a2019a88f00288a822465089cc720b1d997615]
# to [f680e42100ad09229fafcf525dd6cc4715616d19]
#
# patch "packages/klibc/files/staging.patch"
# from [744788fb708efea82c9caafcb0509e1581351bcb]
# to [bc1975706bc1a71fd1daa124ac8934b6cd1183f2]
#
# patch "packages/klibc/klibc-utils-static_1.5.bb"
# from [712cc1a9eaaf4de058b8926a6f376e589d0c865c]
# to [b5447c8999eb05a38a9dc43898f7b18b130f8f28]
#
# patch "packages/klibc/klibc.inc"
# from [53e4f37f521ba3c1a20198a13faa8a95f2f812b8]
# to [c62d790171545f80dae278f763a0f6b65fecec54]
#
# patch "packages/klibc/klibc_1.5.bb"
# from [8afd19f9d2e288ae6198fe88d8c74fb36aa9b9b3]
# to [643abab68d99c185d9d7b361de44cd819352e425]
#
# patch "packages/ttf-fonts/ttf-hunkyfonts_0.3.0.bb"
# from [1fc46ba6b41a744f4d9b6325ab9a0a9e60b0c449]
# to [2c8e299c354f397856eea007f40d25e394290d27]
#
# patch "packages/ttf-fonts/ttf-liberation_0.2.bb"
# from [fe18539b6396ed488cf7b237098a0197235a1cb0]
# to [49d311b3990820ca3220b4c53f655db8b9b22813]
#
# patch "packages/ttf-fonts/ttf-sazanami_20040629.bb"
# from [e4733934ecd19b8573d564e08970529bdf2d650d]
# to [d79c6c82745e6209ecc1faf35918daa85a5fbdf5]
#
# patch "packages/xorg-xserver/xserver-kdrive-imageon_1.2.0.bb"
# from [4b5d3af5cb182cae469a03c02b833de42df211ed]
# to [49383d9c6495c547555c74dcbd0a0e29765cd9fe]
#
============================================================
--- packages/altboot/altboot_1.1.1+wip-SVNR79.bb 92a2019a88f00288a822465089cc720b1d997615
+++ packages/altboot/altboot_1.1.1+wip-SVNR80.bb f680e42100ad09229fafcf525dd6cc4715616d19
@@ -1,8 +1,8 @@ PR = "r0"
require altboot.inc
PR = "r0"
-SVN_REV = "79"
+SVN_REV = "80"
SRC_URI = "svn://hentges.net/public/altboot;module=trunk;rev=${SVN_REV} \
"
============================================================
--- packages/klibc/files/staging.patch 744788fb708efea82c9caafcb0509e1581351bcb
+++ packages/klibc/files/staging.patch bc1975706bc1a71fd1daa124ac8934b6cd1183f2
@@ -1,6 +1,7 @@
-diff -ru klibc.clean/Makefile klibc-1.5/Makefile
---- klibc.clean/Makefile 2008-02-08 22:37:36.000000000 +0100
-+++ klibc-1.5/Makefile 2008-02-15 12:46:48.000000000 +0100
+Index: klibc-1.5/Makefile
+===================================================================
+--- klibc-1.5.orig/Makefile 2007-03-04 02:52:10.000000000 +0100
++++ klibc-1.5/Makefile 2008-02-24 15:25:15.213824149 +0100
@@ -33,7 +33,7 @@
export PERL := perl
@@ -10,10 +11,11 @@ diff -ru klibc.clean/Makefile klibc-1.5/
export bindir = $(prefix)/bin
export libdir = $(prefix)/lib
export mandir = $(prefix)/man
-diff -ru klibc.clean/scripts/Kbuild.install klibc-1.5/scripts/Kbuild.install
---- klibc.clean/scripts/Kbuild.install 2008-02-08 22:37:36.000000000 +0100
-+++ klibc-1.5/scripts/Kbuild.install 2008-02-18 22:36:35.434193918 +0100
-@@ -88,14 +88,11 @@
+Index: klibc-1.5/scripts/Kbuild.install
+===================================================================
+--- klibc-1.5.orig/scripts/Kbuild.install 2007-03-04 02:52:10.000000000 +0100
++++ klibc-1.5/scripts/Kbuild.install 2008-02-24 15:24:28.085825030 +0100
+@@ -88,25 +88,21 @@
header:
$(Q)echo " INSTALL headers + man pages to $(INSTALLROOT)$(INSTALLDIR)"
$(Q)mkdir -p $(INSTALLROOT)$(bindir)
@@ -24,12 +26,15 @@ diff -ru klibc.clean/scripts/Kbuild.inst
$(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include
$(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)lib
- $(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)bin
-- $(Q)set -e ; for d in linux scsi asm-$(KLIBCARCH) asm-generic $(ASMKLIBCARCH); do \
-+ $(Q)-set -e ; for d in linux scsi asm-$(KLIBCARCH) asm-generic $(ASMKLIBCARCH); do \
+ $(Q)set -e ; for d in linux scsi asm-$(KLIBCARCH) asm-generic $(ASMKLIBCARCH); do \
mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KLIBCCROSS)include/$$d ; \
for r in $(KLIBCKERNELSRC)/include $(KLIBCKERNELOBJ)/include \
$(KLIBCKERNELOBJ)/include2 ; do \
-@@ -106,7 +103,6 @@
+ [ ! -d $$r/$$d ] || \
+- cp -rfL $$r/$$d/. \
++ cp -rfd $$r/$$d/. \
+ $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include/$$d/. ; \
+ done ; \
done
$(Q)cd $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include && ln -sf asm-$(KLIBCARCH) asm
$(Q)cp -rf usr/include/. $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include/.
@@ -37,91 +42,100 @@ diff -ru klibc.clean/scripts/Kbuild.inst
$(Q)$(install-bin) $(objtree)/klcc/$(KCROSS)klcc $(INSTALLROOT)$(bindir)
footer: header
-diff -ru klibc.clean/usr/dash/Kbuild klibc-1.5/usr/dash/Kbuild
---- klibc.clean/usr/dash/Kbuild 2008-02-08 22:37:41.000000000 +0100
-+++ klibc-1.5/usr/dash/Kbuild 2008-02-15 12:18:08.000000000 +0100
+Index: klibc-1.5/usr/dash/Kbuild
+===================================================================
+--- klibc-1.5.orig/usr/dash/Kbuild 2007-03-04 02:52:10.000000000 +0100
++++ klibc-1.5/usr/dash/Kbuild 2008-02-24 15:13:50.189827040 +0100
@@ -107,5 +107,3 @@
$(obj)/arith.c: $(obj)/arith.h
$(Q):
-# Targets to install
-install-y := sh.shared
-diff -ru klibc.clean/usr/gzip/Kbuild klibc-1.5/usr/gzip/Kbuild
---- klibc.clean/usr/gzip/Kbuild 2008-02-08 22:37:42.000000000 +0100
-+++ klibc-1.5/usr/gzip/Kbuild 2008-02-15 12:18:24.000000000 +0100
+Index: klibc-1.5/usr/gzip/Kbuild
+===================================================================
+--- klibc-1.5.orig/usr/gzip/Kbuild 2007-03-04 02:52:10.000000000 +0100
++++ klibc-1.5/usr/gzip/Kbuild 2008-02-24 15:13:50.197824604 +0100
@@ -21,5 +21,3 @@
# Cleaning
targets := gzip gzip.g gunzip zcat
-# Targets to install
-install-y := gzip gunzip zcat
-diff -ru klibc.clean/usr/kinit/fstype/Kbuild klibc-1.5/usr/kinit/fstype/Kbuild
---- klibc.clean/usr/kinit/fstype/Kbuild 2008-02-08 22:37:40.000000000 +0100
-+++ klibc-1.5/usr/kinit/fstype/Kbuild 2008-02-15 12:26:20.000000000 +0100
+Index: klibc-1.5/usr/kinit/fstype/Kbuild
+===================================================================
+--- klibc-1.5.orig/usr/kinit/fstype/Kbuild 2007-03-04 02:52:10.000000000 +0100
++++ klibc-1.5/usr/kinit/fstype/Kbuild 2008-02-24 15:13:50.201824503 +0100
@@ -21,5 +21,3 @@
# Cleaning
clean-dirs := static shared
-# install binary
-install-y := $(shared-y)
-diff -ru klibc.clean/usr/kinit/ipconfig/Kbuild klibc-1.5/usr/kinit/ipconfig/Kbuild
---- klibc.clean/usr/kinit/ipconfig/Kbuild 2008-02-08 22:37:40.000000000 +0100
-+++ klibc-1.5/usr/kinit/ipconfig/Kbuild 2008-02-15 12:26:33.000000000 +0100
+Index: klibc-1.5/usr/kinit/ipconfig/Kbuild
+===================================================================
+--- klibc-1.5.orig/usr/kinit/ipconfig/Kbuild 2007-03-04 02:52:10.000000000 +0100
++++ klibc-1.5/usr/kinit/ipconfig/Kbuild 2008-02-24 15:13:50.205824123 +0100
@@ -27,5 +27,3 @@
# Cleaning
clean-dirs := static shared
-# install binary
-install-y := $(shared-y)
-diff -ru klibc.clean/usr/kinit/Kbuild klibc-1.5/usr/kinit/Kbuild
---- klibc.clean/usr/kinit/Kbuild 2008-02-08 22:37:40.000000000 +0100
-+++ klibc-1.5/usr/kinit/Kbuild 2008-02-15 12:18:43.000000000 +0100
+Index: klibc-1.5/usr/kinit/Kbuild
+===================================================================
+--- klibc-1.5.orig/usr/kinit/Kbuild 2007-03-04 02:52:10.000000000 +0100
++++ klibc-1.5/usr/kinit/Kbuild 2008-02-24 15:13:50.209824302 +0100
@@ -33,5 +33,3 @@
subdir- := fstype ipconfig nfsmount resume run-init
-# install binary
-install-y := kinit kinit.shared
-diff -ru klibc.clean/usr/kinit/nfsmount/Kbuild klibc-1.5/usr/kinit/nfsmount/Kbuild
---- klibc.clean/usr/kinit/nfsmount/Kbuild 2008-02-08 22:37:40.000000000 +0100
-+++ klibc-1.5/usr/kinit/nfsmount/Kbuild 2008-02-15 12:26:46.000000000 +0100
+Index: klibc-1.5/usr/kinit/nfsmount/Kbuild
+===================================================================
+--- klibc-1.5.orig/usr/kinit/nfsmount/Kbuild 2007-03-04 02:52:10.000000000 +0100
++++ klibc-1.5/usr/kinit/nfsmount/Kbuild 2008-02-24 15:13:50.213824201 +0100
@@ -23,5 +23,3 @@
clean-dirs := static shared
-# Install binary
-install-y := $(shared-y)
-diff -ru klibc.clean/usr/kinit/resume/Kbuild klibc-1.5/usr/kinit/resume/Kbuild
---- klibc.clean/usr/kinit/resume/Kbuild 2008-02-08 22:37:39.000000000 +0100
-+++ klibc-1.5/usr/kinit/resume/Kbuild 2008-02-15 12:27:01.000000000 +0100
+Index: klibc-1.5/usr/kinit/resume/Kbuild
+===================================================================
+--- klibc-1.5.orig/usr/kinit/resume/Kbuild 2007-03-04 02:52:10.000000000 +0100
++++ klibc-1.5/usr/kinit/resume/Kbuild 2008-02-24 15:13:50.217824380 +0100
@@ -26,5 +26,3 @@
# Cleaning
clean-dirs := static shared
-# install binary
-install-y := $(shared-y)
-diff -ru klibc.clean/usr/kinit/run-init/Kbuild klibc-1.5/usr/kinit/run-init/Kbuild
---- klibc.clean/usr/kinit/run-init/Kbuild 2008-02-08 22:37:39.000000000 +0100
-+++ klibc-1.5/usr/kinit/run-init/Kbuild 2008-02-15 12:27:12.000000000 +0100
+Index: klibc-1.5/usr/kinit/run-init/Kbuild
+===================================================================
+--- klibc-1.5.orig/usr/kinit/run-init/Kbuild 2007-03-04 02:52:10.000000000 +0100
++++ klibc-1.5/usr/kinit/run-init/Kbuild 2008-02-24 15:13:50.221824559 +0100
@@ -21,5 +21,3 @@
# Cleaning
clean-dirs := static shared
-# install binary
-install-y := $(shared-y)
-Only in klibc-1.5/usr/klibc/arch/arm: klib.list
-diff -ru klibc.clean/usr/klibc/Kbuild klibc-1.5/usr/klibc/Kbuild
---- klibc.clean/usr/klibc/Kbuild 2008-02-08 22:37:49.000000000 +0100
-+++ klibc-1.5/usr/klibc/Kbuild 2008-02-15 12:17:24.000000000 +0100
+Index: klibc-1.5/usr/klibc/Kbuild
+===================================================================
+--- klibc-1.5.orig/usr/klibc/Kbuild 2007-03-04 02:52:10.000000000 +0100
++++ klibc-1.5/usr/klibc/Kbuild 2008-02-24 15:13:50.229824358 +0100
@@ -175,5 +175,3 @@
$(INSTALLROOT)$(INSTALLDIR)/$(KLIBCCROSS)lib))
$(Q)$(install-lib) $(obj)/klibc-$(SOLIBHASH).so \
$(INSTALLROOT)$(INSTALLDIR)/$(KLIBCCROSS)lib
- $(Q)$(install-lib) $(obj)/klibc-$(SOLIBHASH).so \
- $(INSTALLROOT)$(SHLIBDIR)
-diff -ru klibc.clean/usr/utils/Kbuild klibc-1.5/usr/utils/Kbuild
---- klibc.clean/usr/utils/Kbuild 2008-02-08 22:37:37.000000000 +0100
-+++ klibc-1.5/usr/utils/Kbuild 2008-02-15 12:17:51.000000000 +0100
+Index: klibc-1.5/usr/utils/Kbuild
+===================================================================
+--- klibc-1.5.orig/usr/utils/Kbuild 2007-03-04 02:52:10.000000000 +0100
++++ klibc-1.5/usr/utils/Kbuild 2008-02-24 15:13:50.229824358 +0100
@@ -64,5 +64,3 @@
# Clean deletes the static and shared dir
clean-dirs := static shared
============================================================
--- packages/klibc/klibc-utils-static_1.5.bb 712cc1a9eaaf4de058b8926a6f376e589d0c865c
+++ packages/klibc/klibc-utils-static_1.5.bb b5447c8999eb05a38a9dc43898f7b18b130f8f28
@@ -1,9 +1,7 @@ require klibc-common.inc
require klibc-common.inc
-PR = "r4"
+PR = "r5"
-SRC_URI_append_linux-gnueabi = "\
- file://klibc-config-eabi.patch;patch=1"
# We only want the static utils. klibc build both. So we install only what we want.
do_install() {
============================================================
--- packages/klibc/klibc.inc 53e4f37f521ba3c1a20198a13faa8a95f2f812b8
+++ packages/klibc/klibc.inc c62d790171545f80dae278f763a0f6b65fecec54
@@ -1,9 +1,8 @@ SRC_URI += "file://staging.patch;patch=1
require klibc-common.inc
SRC_URI += "file://staging.patch;patch=1 \
file://klibc_kexecsyscall.patch;patch=1 \
"
-SRC_URI_append_linux-gnueabi = "file://klibc-config-eabi.patch;patch=1"
# we want only the shared programms and the lib so we chose them manually
do_install() {
============================================================
--- packages/klibc/klibc_1.5.bb 8afd19f9d2e288ae6198fe88d8c74fb36aa9b9b3
+++ packages/klibc/klibc_1.5.bb 643abab68d99c185d9d7b361de44cd819352e425
@@ -1,2 +1,2 @@ require klibc.inc
require klibc.inc
+PR = "r3"
-PR = "r1"
============================================================
--- packages/ttf-fonts/ttf-hunkyfonts_0.3.0.bb 1fc46ba6b41a744f4d9b6325ab9a0a9e60b0c449
+++ packages/ttf-fonts/ttf-hunkyfonts_0.3.0.bb 2c8e299c354f397856eea007f40d25e394290d27
@@ -10,5 +10,6 @@ PACKAGES = "${PN}-dbg ttf-hunky-sans ttf
S = "${WORKDIR}/hunkyfonts-${PV}/TTF/"
PACKAGES = "${PN}-dbg ttf-hunky-sans ttf-hunky-serif"
+RRECOMMENDS_${PN}-dbg = ""
FILES_ttf-hunky-sans = "${datadir}/fonts/truetype/HunkySans*.ttf"
FILES_ttf-hunky-serif = "${datadir}/fonts/truetype/HunkySerif*.ttf"
============================================================
--- packages/ttf-fonts/ttf-liberation_0.2.bb fe18539b6396ed488cf7b237098a0197235a1cb0
+++ packages/ttf-fonts/ttf-liberation_0.2.bb 49d311b3990820ca3220b4c53f655db8b9b22813
@@ -9,6 +9,8 @@ PACKAGES = "${PN}-dbg ttf-liberation-mon
S = "${WORKDIR}/liberation-fonts-${PV}"
PACKAGES = "${PN}-dbg ttf-liberation-mono ttf-liberation-sans ttf-liberation-serif"
+RRECOMMENDS_${PN}-dbg = ""
+
FILES_ttf-liberation-mono = "${datadir}/fonts/truetype/*Mono*"
FILES_ttf-liberation-sans = "${datadir}/fonts/truetype/*Sans*"
FILES_ttf-liberation-serif = "${datadir}/fonts/truetype/*Serif*"
============================================================
--- packages/ttf-fonts/ttf-sazanami_20040629.bb e4733934ecd19b8573d564e08970529bdf2d650d
+++ packages/ttf-fonts/ttf-sazanami_20040629.bb d79c6c82745e6209ecc1faf35918daa85a5fbdf5
@@ -14,6 +14,7 @@ PACKAGES = "${PN}-dbg ttf-sazanami-gothi
S = "${WORKDIR}/sazanami-20040629"
PACKAGES = "${PN}-dbg ttf-sazanami-gothic ttf-sazanami-mincho"
+RRECOMMENDS_${PN}-dbg = ""
FILES_ttf-sazanami-gothic = "${datadir}/fonts/truetype/sazanami-gothic.ttf \
${datadir}/doc/ttf-sazanami-gothic/README"
FILES_ttf-sazanami-mincho = "${datadir}/fonts/truetype/sazanami-mincho.ttf \
============================================================
--- packages/xorg-xserver/xserver-kdrive-imageon_1.2.0.bb 4b5d3af5cb182cae469a03c02b833de42df211ed
+++ packages/xorg-xserver/xserver-kdrive-imageon_1.2.0.bb 49383d9c6495c547555c74dcbd0a0e29765cd9fe
@@ -9,7 +9,7 @@ PR = "r4"
PE = "1"
PR = "r4"
-FILESPATH = "${FILE_DIRNAME}/xserver-kdrive-1.2.0:${FILE_DIRNAME}/xserver-kdrive"
+FILESPATH = "${FILE_DIRNAME}/xserver-kdrive-${PV}:${FILE_DIRNAME}/xserver-kdrive:${FILE_DIRNAME}/files"
SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
${KDRIVE_COMMON_PATCHES} \
file://kdrive-evdev.patch;patch=1 \
More information about the Openembedded-commits
mailing list