[oe-commits] org.oe.dev merge of 'b7175a8d7fdb02e01e375f3df1f6ab39e8ef01ed'
crofton commit
oe at amethyst.openembedded.net
Mon Sep 1 17:53:13 UTC 2008
merge of 'b7175a8d7fdb02e01e375f3df1f6ab39e8ef01ed'
and 'd1d0e66906b855684896804e34694a07d4958fe4'
Author: crofton at openembedded.org
Branch: org.openembedded.dev
Revision: 7d3ee6f9dd094cfa51709c24c15492d19ad64af7
ViewMTN: http://monotone.openembedded.org/revision/info/7d3ee6f9dd094cfa51709c24c15492d19ad64af7
Files:
1
packages/nfs-utils/nfs-utils_1.1.2.bb
files/device_table_add-mmc.txt
files/device_table-collie.txt
packages/images/initramfs-kexec-image.bb
packages/kexecboot/initramfs-kexecboot-image.bb
packages/initrdscripts/initramfs-kexec_1.0.bb
packages/kexecboot/initramfs-kexecboot_1.0.bb
packages/linux/linux-kexecboot-2.6.26
packages/kexecboot/linux-kexecboot-2.6.26
packages/linux/linux-kexecboot.inc
packages/kexecboot/linux-kexecboot.inc
packages/linux/linux-kexecboot_2.6.26.bb
packages/kexecboot/linux-kexecboot_2.6.26.bb
packages/fontconfig/fontconfig-2.6.0
packages/gsoap/gsoap-native
packages/kexecboot
packages/nandlogical
packages/nandlogical/files
packages/fontconfig/fontconfig-2.6.0/fix-pkgconfig.patch
packages/fontconfig/fontconfig-native_2.6.0.bb
packages/fontconfig/fontconfig_2.6.0.bb
packages/gsoap/gsoap-native/use-just-built-binary.patch
packages/kexecboot/kexecboot_0.3.bb
packages/kexecboot/linux-kexecboot-2.6.26/binutils-buildid-arm.patch
packages/kexecboot/linux-kexecboot-2.6.26/collie.patch
packages/kexecboot/linux-kexecboot-2.6.26/collie_keymap.patch
packages/kexecboot/linux-kexecboot-2.6.26/connectplus-prevent-oops-HACK.patch
packages/kexecboot/linux-kexecboot-2.6.26/connectplus-remove-ide-HACK.patch
packages/kexecboot/linux-kexecboot-2.6.26/defconfig-akita
packages/kexecboot/linux-kexecboot-2.6.26/defconfig-bootcdx86
packages/kexecboot/linux-kexecboot-2.6.26/defconfig-c7x0
packages/kexecboot/linux-kexecboot-2.6.26/defconfig-collie
packages/kexecboot/linux-kexecboot-2.6.26/defconfig-htcuniversal
packages/kexecboot/linux-kexecboot-2.6.26/defconfig-hx2000
packages/kexecboot/linux-kexecboot-2.6.26/defconfig-poodle
packages/kexecboot/linux-kexecboot-2.6.26/defconfig-qemuarm
packages/kexecboot/linux-kexecboot-2.6.26/defconfig-qemux86
packages/kexecboot/linux-kexecboot-2.6.26/defconfig-spitz
packages/kexecboot/linux-kexecboot-2.6.26/defconfig-zylonite
packages/kexecboot/linux-kexecboot-2.6.26/hostap-monitor-mode.patch
packages/kexecboot/linux-kexecboot-2.6.26/hrw-hostapcard.patch
packages/kexecboot/linux-kexecboot-2.6.26/htcuni-acx.patch
packages/kexecboot/linux-kexecboot-2.6.26/htcuni.patch
packages/kexecboot/linux-kexecboot-2.6.26/pxa-serial-hack.patch
packages/kexecboot/linux-kexecboot-2.6.26/pxa_fb_overlay.patch
packages/kexecboot/linux-kexecboot-2.6.26/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch
packages/kexecboot/linux-kexecboot-2.6.26/sharpsl-rc-r1.patch
packages/kexecboot/linux-kexecboot-2.6.26/spitz_h_rewrite.patch
packages/kexecboot/linux-kexecboot-2.6.26/versatile-armv6.patch
packages/kexecboot/linux-kexecboot-2.6.26/zaurus-i2c-init.patch
packages/kexecboot/linux-kexecboot-2.6.26/zylonite-boot.patch
packages/kexecboot/linux-kexecboot-2.6.26/zylonite_keypad-r0.patch
packages/kexecboot/linux-kexecboot-2.6.26/zylonite_mtd-r0.patch
packages/kexecboot/linux-kexecboot-2.6.26/zylonite_touch-r0.patch
packages/nandlogical/files/nandlogical.c
packages/nandlogical/nandlogical_1.0.0.bb
packages/neuros-public/neuros-app-photoalbum_git.bb
packages/neuros-public/neuros-app-vplayer_git.bb
packages/neuros-public/neuros-lib-gui_git.bb
packages/strace/strace/mips-sigcontext.patch
classes/kernel.bbclass
conf/distro/include/sane-srcrevs.inc
conf/machine/collie.conf
conf/machine/include/zaurus-2.6.inc
packages/dgen/dgen-sdl-1.23/fix-configure-and-make.patch
packages/dgen/dgen-sdl_1.23.bb
packages/ffmpeg/ffmpeg_git.bb
packages/freesmartphone/frameworkd_git.bb
packages/glibc/glibc.inc
packages/glibc/glibc_2.6.1.bb
packages/gsoap/gsoap-native_2.7.7.bb
packages/linux/linux-neuros_git.bb
packages/linux/linux-rp-2.6.26/defconfig-collie
packages/neuros-pkggen/files/package.c
packages/neuros-pkggen/neuros-pkggen-native.bb
packages/neuros-public/neuros-lib-widgets_git.bb
packages/neuros-public/neuros-nwm_git.bb
packages/neuros-public/neuros-qt-plugins_git.bb
packages/otpcalc/otpcalc_0.97.bb
packages/strace/strace_4.5.14.bb
packages/tangogps/tangogps.inc
packages/vlc/vlc-davinci_0.8.6h.bb
packages/webkit/webkit-gtk/GNUmakefile.am
packages/webkit/webkit-gtk/configure.ac
site/mips-linux
site/mipsel-linux
Diffs:
#
# mt diff -rb7175a8d7fdb02e01e375f3df1f6ab39e8ef01ed -r7d3ee6f9dd094cfa51709c24c15492d19ad64af7
#
#
#
# patch "packages/nfs-utils/nfs-utils_1.1.2.bb"
# from [c8fc676bb8563f810f362e205ae46c3b75388b51]
# to [1815e0ef2aa6e30bdea10f6313e236b9f67ac58f]
#
============================================================
--- packages/nfs-utils/nfs-utils_1.1.2.bb c8fc676bb8563f810f362e205ae46c3b75388b51
+++ packages/nfs-utils/nfs-utils_1.1.2.bb 1815e0ef2aa6e30bdea10f6313e236b9f67ac58f
@@ -3,6 +3,8 @@ LICENSE = "GPL"
SECTION = "console/network"
LICENSE = "GPL"
+PR = "2"
+
DEPENDS = "tcp-wrappers libevent"
SRC_URI = "${SOURCEFORGE_MIRROR}/nfs/nfs-utils-${PV}.tar.gz \
@@ -45,14 +47,17 @@ do_install() {
install -m 0755 ${WORKDIR}/nfsserver ${D}${sysconfdir}/init.d/nfsserver
install -d ${D}${sbindir}
+ install -d ${D}${base_sbindir}
install -m 0755 ${S}/utils/exportfs/exportfs ${D}${sbindir}/exportfs
install -m 0755 ${S}/utils/mountd/mountd ${D}${sbindir}/mountd
- install -m 0755 ${S}/utils/mount/mount.nfs ${D}${sbindir}/mount.nfs
+ install -m 0755 ${S}/utils/mount/mount.nfs ${D}${base_sbindir}/mount.nfs
install -m 0755 ${S}/utils/nfsd/nfsd ${D}${sbindir}/nfsd
install -m 0755 ${S}/utils/nfsstat/nfsstat ${D}${sbindir}/nfsstat
install -m 0755 ${S}/utils/showmount/showmount ${D}${sbindir}/showmount
install -m 0755 ${S}/utils/statd/statd ${D}${sbindir}/statd
+ ln -s ${D}/${base_sbindir}/mount.nfs ${D}/${base_sbindir}/mount.nfs4
+
install -d ${D}${mandir}/man8
install -m 0644 ${S}/utils/exportfs/exportfs.man ${D}${mandir}/man8/exportfs.8
install -m 0644 ${S}/utils/mountd/mountd.man ${D}${mandir}/man8/mountd.8
@@ -61,3 +66,6 @@ do_install() {
install -m 0644 ${S}/utils/showmount/showmount.man ${D}${mandir}/man8/showmount.8
install -m 0644 ${S}/utils/statd/statd.man ${D}${mandir}/man8/statd.8
}
+
+PACKAGES =+ "nfs-utils-client"
+FILES_nfs-utils-client = "${base_sbindir}/mount.nfs ${base_sbindir}/mount.nfs4"
#
# mt diff -rd1d0e66906b855684896804e34694a07d4958fe4 -r7d3ee6f9dd094cfa51709c24c15492d19ad64af7
#
#
#
# rename "files/device_table_add-mmc.txt"
# to "files/device_table-collie.txt"
#
# rename "packages/images/initramfs-kexec-image.bb"
# to "packages/kexecboot/initramfs-kexecboot-image.bb"
#
# rename "packages/initrdscripts/initramfs-kexec_1.0.bb"
# to "packages/kexecboot/initramfs-kexecboot_1.0.bb"
#
# rename "packages/linux/linux-kexecboot-2.6.26"
# to "packages/kexecboot/linux-kexecboot-2.6.26"
#
# rename "packages/linux/linux-kexecboot.inc"
# to "packages/kexecboot/linux-kexecboot.inc"
#
# rename "packages/linux/linux-kexecboot_2.6.26.bb"
# to "packages/kexecboot/linux-kexecboot_2.6.26.bb"
#
# add_dir "packages/fontconfig/fontconfig-2.6.0"
#
# add_dir "packages/gsoap/gsoap-native"
#
# add_dir "packages/kexecboot"
#
# add_dir "packages/nandlogical"
#
# add_dir "packages/nandlogical/files"
#
# add_file "packages/fontconfig/fontconfig-2.6.0/fix-pkgconfig.patch"
# content [5151c1f229c32c3ecb233fa9bd718d0b50d6ff1c]
#
# add_file "packages/fontconfig/fontconfig-native_2.6.0.bb"
# content [24c03de8b197db8f1a84eb259d920c904b79f74b]
#
# add_file "packages/fontconfig/fontconfig_2.6.0.bb"
# content [5554f91bd476e11e0bb44b471239d177ef4b0faa]
#
# add_file "packages/gsoap/gsoap-native/use-just-built-binary.patch"
# content [3494a4c5a9654fc35b3d6f43f4b3cf74187df695]
#
# add_file "packages/kexecboot/kexecboot_0.3.bb"
# content [0ca1d7664f36aed1936462e2c084e6fb1fcfcece]
#
# add_file "packages/kexecboot/linux-kexecboot-2.6.26/binutils-buildid-arm.patch"
# content [0a9c96315b18cb403f1014aec2038e9477c2db07]
#
# add_file "packages/kexecboot/linux-kexecboot-2.6.26/collie.patch"
# content [98c325a4a359d1c1486ffc16439210f5f5adb9b6]
#
# add_file "packages/kexecboot/linux-kexecboot-2.6.26/collie_keymap.patch"
# content [d57618e329b43a114c5a25b5b8bdb408600074ff]
#
# add_file "packages/kexecboot/linux-kexecboot-2.6.26/connectplus-prevent-oops-HACK.patch"
# content [e7f07c5193600ba480642fd62dcae173b6b62189]
#
# add_file "packages/kexecboot/linux-kexecboot-2.6.26/connectplus-remove-ide-HACK.patch"
# content [8ffef06194b29e2b22abed7edb6044a5ad4316d7]
#
# add_file "packages/kexecboot/linux-kexecboot-2.6.26/defconfig-akita"
# content [064c36530b213dae882be1b6bb2cbab8615906f8]
#
# add_file "packages/kexecboot/linux-kexecboot-2.6.26/defconfig-bootcdx86"
# content [83dbfc0474bb18348ca67718d27d2dcc262095a3]
#
# add_file "packages/kexecboot/linux-kexecboot-2.6.26/defconfig-c7x0"
# content [9840eec605b360f4cdcf976973331ce274a89b6f]
#
# add_file "packages/kexecboot/linux-kexecboot-2.6.26/defconfig-collie"
# content [89b2f472fb93e5c5cc06598c758a90308c3c0106]
#
# add_file "packages/kexecboot/linux-kexecboot-2.6.26/defconfig-htcuniversal"
# content [afcff96c3bba46e09d06200f4431c95fdb419893]
#
# add_file "packages/kexecboot/linux-kexecboot-2.6.26/defconfig-hx2000"
# content [8d4023e3a924b2d01a60011c6aa81cca7bc83d06]
#
# add_file "packages/kexecboot/linux-kexecboot-2.6.26/defconfig-poodle"
# content [823d2a1579f2e5312396ba4c0d40a7405bcebd4f]
#
# add_file "packages/kexecboot/linux-kexecboot-2.6.26/defconfig-qemuarm"
# content [19a7a240f8a4fd58732db1ccb11767dac8fc7221]
#
# add_file "packages/kexecboot/linux-kexecboot-2.6.26/defconfig-qemux86"
# content [8f2d48208eb79e7a2e00941efcaee2cad2d34737]
#
# add_file "packages/kexecboot/linux-kexecboot-2.6.26/defconfig-spitz"
# content [121ce2ca2da79de4072c338f63ad9e345f2674bb]
#
# add_file "packages/kexecboot/linux-kexecboot-2.6.26/defconfig-zylonite"
# content [71cf26b625ad773ac5468869fe7052854759f70f]
#
# add_file "packages/kexecboot/linux-kexecboot-2.6.26/hostap-monitor-mode.patch"
# content [7b6d1b43c24eb7c1135e018aa8ef42f28f5ded00]
#
# add_file "packages/kexecboot/linux-kexecboot-2.6.26/hrw-hostapcard.patch"
# content [57f42102146c4908611f21d2fcf3342587c07066]
#
# add_file "packages/kexecboot/linux-kexecboot-2.6.26/htcuni-acx.patch"
# content [12ac6d8ef90c4bbd6b06a294889b80e6e53aa996]
#
# add_file "packages/kexecboot/linux-kexecboot-2.6.26/htcuni.patch"
# content [1fadf7843ab2feb14c2465130435b34dab802e70]
#
# add_file "packages/kexecboot/linux-kexecboot-2.6.26/pxa-serial-hack.patch"
# content [af916d2b2561b14a1e40383de584a3a60110b5e4]
#
# add_file "packages/kexecboot/linux-kexecboot-2.6.26/pxa_fb_overlay.patch"
# content [585b5ef26c37766ec384c810ab5bd055e44d1e8a]
#
# add_file "packages/kexecboot/linux-kexecboot-2.6.26/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch"
# content [dd09cc9eb4d3abd338470eb2a61db0e8faf293cb]
#
# add_file "packages/kexecboot/linux-kexecboot-2.6.26/sharpsl-rc-r1.patch"
# content [b6f473089db62d2651b38cd14da388d52cf3f6e1]
#
# add_file "packages/kexecboot/linux-kexecboot-2.6.26/spitz_h_rewrite.patch"
# content [e027c82b90e2c45a5585e588b58af778b473bd62]
#
# add_file "packages/kexecboot/linux-kexecboot-2.6.26/versatile-armv6.patch"
# content [9c7b6904ff1559c5c7163733f9b80bf737a5628b]
#
# add_file "packages/kexecboot/linux-kexecboot-2.6.26/zaurus-i2c-init.patch"
# content [e87d480dedb22e40b8be1f27bad9b1b4946c405a]
#
# add_file "packages/kexecboot/linux-kexecboot-2.6.26/zylonite-boot.patch"
# content [e47e2f442bc69d9679debc127d56ce0ad366ed6b]
#
# add_file "packages/kexecboot/linux-kexecboot-2.6.26/zylonite_keypad-r0.patch"
# content [7c4b5a7fe857418dd72379aaa883204d069abb8e]
#
# add_file "packages/kexecboot/linux-kexecboot-2.6.26/zylonite_mtd-r0.patch"
# content [2be88dd03ad102fe0a6168eb2fa2553841b40aef]
#
# add_file "packages/kexecboot/linux-kexecboot-2.6.26/zylonite_touch-r0.patch"
# content [0e1b8affcaa0a0a6688dc9ebcb1945a70414ddb0]
#
# add_file "packages/nandlogical/files/nandlogical.c"
# content [3fd269d18fc80cb452eb8173dfcf8a67228ea72d]
#
# add_file "packages/nandlogical/nandlogical_1.0.0.bb"
# content [08c2eb3a4bb34c4e5c03d312718add26413df421]
#
# add_file "packages/neuros-public/neuros-app-photoalbum_git.bb"
# content [416328da2e90add3a3853d718ccea008eda78656]
#
# add_file "packages/neuros-public/neuros-app-vplayer_git.bb"
# content [299d2a1a69bef11fae99e7febe2ea7a51c2b3dc2]
#
# add_file "packages/neuros-public/neuros-lib-gui_git.bb"
# content [7348c5d289f759314009104632995680329630b8]
#
# add_file "packages/strace/strace/mips-sigcontext.patch"
# content [ccd084f7dff69f0181af30ba7ac01b23ddfc3678]
#
# patch "classes/kernel.bbclass"
# from [3ffe1672ca1e9239f5d1d1b3d0b8264888a6808b]
# to [aaee7c587861c7c66d492ee0c8e7540f99932496]
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [728a45d37a508823fda1cfd83bb3650ef5d90e8a]
# to [e7f1c0d7193f9a530c664aba1c14dd7ffd668f2b]
#
# patch "conf/machine/collie.conf"
# from [334ab4b53eea3f3be4a7b39b8fac9412b650aef2]
# to [92ccb90cdd6b6e8105a05ee7943626bd0409d6ea]
#
# patch "conf/machine/include/zaurus-2.6.inc"
# from [8294b7a8b586a8481132e82ee1e468c413001cb9]
# to [d5af9251eed68a286197deb3a5761113b02bbd2f]
#
# patch "files/device_table-collie.txt"
# from [fcb6f461f63fe3444ef486405ff97906d7c7fb9a]
# to [e9f73e89845d2657398da6a812c4447e45a3cd5d]
#
# patch "packages/dgen/dgen-sdl-1.23/fix-configure-and-make.patch"
# from [f5ec6489f490fbe135c91e1d2aa9145eacbabdd6]
# to [8d8a0491ca3bb65bbcb1eba647de9f447ce859c6]
#
# patch "packages/dgen/dgen-sdl_1.23.bb"
# from [a3aecaa526b1fad198c4eeff09990398df3eafbc]
# to [5385ad78b79a29edbb73c8dccd827c3466dc7881]
#
# patch "packages/ffmpeg/ffmpeg_git.bb"
# from [ef01666ee577eb22fd1c4f1eeedd7544540df46b]
# to [b95d010568a0ab37a6ab0ef5c267c9d3580ace9d]
#
# patch "packages/freesmartphone/frameworkd_git.bb"
# from [ce937c1ef7f7922020eaaabc3f9b59a6444b1544]
# to [500c5a7db116c70138d4188704cb83417b655625]
#
# patch "packages/glibc/glibc.inc"
# from [616d34fb71075168d558a2c23652b0847b62e379]
# to [2d332284f28dce392d63f89441b2747b62db4751]
#
# patch "packages/glibc/glibc_2.6.1.bb"
# from [77cf632ae1fc1464c20204d36e370aa655ffa09a]
# to [57bf7eb6dae142987a9e81c5916a9181d7ec554a]
#
# patch "packages/gsoap/gsoap-native_2.7.7.bb"
# from [e2f96667aeea0e85e754378570e59305d6476439]
# to [a137c032ea061e49419203c45e853ea4bd81b14e]
#
# patch "packages/kexecboot/initramfs-kexecboot-image.bb"
# from [5d39e3585a4b60bb1a3abbb4cb5182e5a43b2e7b]
# to [49a37389a0b8c994692be3e879add614ff95ceff]
#
# patch "packages/kexecboot/initramfs-kexecboot_1.0.bb"
# from [19eebe40da32b895da48037b3aadec5cdda88979]
# to [824b48b2024b712c5c2be285049697318d6dc372]
#
# patch "packages/kexecboot/linux-kexecboot.inc"
# from [b1e9350d2c88928146c9e589e65cb802829b65c1]
# to [01dd6603a2a2fb2e9c3c56c171153b59ac8ec096]
#
# patch "packages/linux/linux-neuros_git.bb"
# from [f776e221893fa16a1e86401186421973419fa57e]
# to [c0d3d98cd5c172f91ccbb86f1a5b442cdfd710d6]
#
# patch "packages/linux/linux-rp-2.6.26/defconfig-collie"
# from [1e9b95a0d88a54777e7f56273ef6fdb091b59ba4]
# to [7e764ba8612e45c23027e7edc4467de2fbbe0d95]
#
# patch "packages/neuros-pkggen/files/package.c"
# from [5b9ae408e185322aca1c6b3fb68aa5c38ec7f44a]
# to [cf8bc159d1fc793a93448e82dcc0f69ad8d075a5]
#
# patch "packages/neuros-pkggen/neuros-pkggen-native.bb"
# from [a724aaecd6c0bae0cdcb4a47a1c834877c51045d]
# to [2fb19efa21fb1da401e283f710a450ea60527202]
#
# patch "packages/neuros-public/neuros-lib-widgets_git.bb"
# from [066f779d14370cd80cffd7fd784d04df7990a255]
# to [52eb100795eab3da97793d1a0c56f1d37c3cf2d0]
#
# patch "packages/neuros-public/neuros-nwm_git.bb"
# from [8066ae3bdfcaa465ac10245698627f7a5653631c]
# to [69c49f36ea0a2a061449099bf15772969f100cf4]
#
# patch "packages/neuros-public/neuros-qt-plugins_git.bb"
# from [8e03d1bc20bb51c31f921404d846b4c6fa902d59]
# to [2e1adba40fc931ff78f3cd1d9c44960eb03eb99a]
#
# patch "packages/otpcalc/otpcalc_0.97.bb"
# from [53c0c060006d6a65c1ca1f03f90de81b52b1ffd9]
# to [bcfa78f34255fbf17658a52b3d47a596146ff8d1]
#
# patch "packages/strace/strace_4.5.14.bb"
# from [024b28b25f1ee50ef24eb3f59862d67bc1c27c9b]
# to [4fb203edb2b91681028f737a0759796914297980]
#
# patch "packages/tangogps/tangogps.inc"
# from [de7d80f65e318ef9e683909557fcc644a5db46ab]
# to [4eec9ca4fc79d22c801894b8a77d9fa9b253554b]
#
# patch "packages/vlc/vlc-davinci_0.8.6h.bb"
# from [b6c1bda931bc3931b51360e18ec6341576756a47]
# to [52ee814151b9134b026968bc047921f383abf0a6]
#
# patch "packages/webkit/webkit-gtk/GNUmakefile.am"
# from [cd85767a047ac2d58ffd39cb9068ef1ab226d847]
# to [19d62160616b80e6684d9f8e2adfcb61e13c2c54]
#
# patch "packages/webkit/webkit-gtk/configure.ac"
# from [a0b6b788b46f20b4bdcf3b5a8338e7f7353fde1e]
# to [8689b13d5c83b815d45d8e8981dd8429880906a0]
#
# patch "site/mips-linux"
# from [6e62c6b2a9dbd94fcd404675ace77e8f072cca30]
# to [e42e1ecf3d371ff63b016d8802bb5c0ef6f1a688]
#
# patch "site/mipsel-linux"
# from [6e62c6b2a9dbd94fcd404675ace77e8f072cca30]
# to [10c30659ccc13c29d2d29be395d5c9409800880a]
#
============================================================
--- packages/fontconfig/fontconfig-2.6.0/fix-pkgconfig.patch 5151c1f229c32c3ecb233fa9bd718d0b50d6ff1c
+++ packages/fontconfig/fontconfig-2.6.0/fix-pkgconfig.patch 5151c1f229c32c3ecb233fa9bd718d0b50d6ff1c
@@ -0,0 +1,15 @@
+---
+ fontconfig.pc.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- fontconfig-2.6.0.orig/fontconfig.pc.in
++++ fontconfig-2.6.0/fontconfig.pc.in
+@@ -5,7 +5,7 @@ includedir=@includedir@
+
+ Name: Fontconfig
+ Description: Font configuration and customization library
+ Version: @VERSION@
+ Libs: -L${libdir} -lfontconfig
+-Libs.private: @EXPAT_LIBS@ @FREETYPE_LIBS@
++Libs.private: @EXPAT_LIBS@ -L${libdir} -lfreetype
+ Cflags: -I${includedir}
============================================================
--- packages/fontconfig/fontconfig-native_2.6.0.bb 24c03de8b197db8f1a84eb259d920c904b79f74b
+++ packages/fontconfig/fontconfig-native_2.6.0.bb 24c03de8b197db8f1a84eb259d920c904b79f74b
@@ -0,0 +1,15 @@
+SECTION = "base"
+LICENSE = "BSD"
+require fontconfig_${PV}.bb
+inherit native
+DEPENDS = "freetype-native expat-native zlib-native"
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/fontconfig-${PV}"
+
+EXTRA_OEMAKE = ""
+EXTRA_OECONF = "${@[' --disable-docs',' --disable-docs --with-freetype-config=%s/freetype-config' % bb.data.getVar('STAGING_BINDIR', d, 1)][os.path.isfile('%s/freetype-config' % bb.data.getVar('STAGING_BINDIR', d, 1))]}"
+
+do_stage () {
+ oe_runmake install
+ install fc-lang/fc-lang ${STAGING_BINDIR}
+ install fc-glyphname/fc-glyphname ${STAGING_BINDIR}
+}
============================================================
--- packages/fontconfig/fontconfig_2.6.0.bb 5554f91bd476e11e0bb44b471239d177ef4b0faa
+++ packages/fontconfig/fontconfig_2.6.0.bb 5554f91bd476e11e0bb44b471239d177ef4b0faa
@@ -0,0 +1,76 @@
+SECTION = "libs"
+LICENSE = "BSD"
+DESCRIPTION = "A library for configuring and customizing font access."
+DEPENDS = "expat freetype zlib"
+
+SRC_URI = "http://fontconfig.org/release/fontconfig-${PV}.tar.gz \
+ file://fix-pkgconfig.patch;patch=1"
+
+PACKAGES =+ "fontconfig-utils-dbg fontconfig-utils "
+FILES_fontconfig-utils-dbg = "${bindir}/*.dbg"
+FILES_fontconfig-utils = "${bindir}/*"
+
+# Work around past breakage in debian.bbclass
+RPROVIDES_fontconfig-utils = "libfontconfig-utils"
+RREPLACES_fontconfig-utils = "libfontconfig-utils"
+RCONFLICTS_fontconfig-utils = "libfontconfig-utils"
+DEBIAN_NOAUTONAME_fontconfig-utils = "1"
+
+S = "${WORKDIR}/fontconfig-${PV}"
+
+PARALLEL_MAKE = ""
+
+inherit autotools pkgconfig
+
+export HASDOCBOOK="no"
+
+EXTRA_OECONF = " --disable-docs --with-arch=${HOST_ARCH}"
+EXTRA_OEMAKE = "FC_LANG=fc-lang FC_GLYPHNAME=fc-glyphname"
+
+# The tarball has some of the patched files as read only, which
+# patch doesn't like at all
+
+fontconfig_do_unpack() {
+ chmod -R u+rw ${S}
+}
+
+python do_unpack () {
+ bb.build.exec_func('base_do_unpack', d)
+ bb.build.exec_func('fontconfig_do_unpack', d)
+}
+
+do_stage () {
+ oe_libinstall -so -a -C src libfontconfig ${STAGING_LIBDIR}
+ install -d ${STAGING_INCDIR}/fontconfig
+ for i in ${S}/fontconfig/*.h; do install -m 0644 $i ${STAGING_INCDIR}/fontconfig/; done
+}
+
+BUILD_CFLAGS += " -I${STAGING_INCDIR}/freetype2"
+
+do_configure_append () {
+ sed -i 's|LDFLAGS =.*|LDFLAGS =|' fc-case/Makefile
+ sed -i 's|LDFLAGS =.*|LDFLAGS =|' fc-glyphname/Makefile
+ sed -i 's|LDFLAGS =.*|LDFLAGS =|' fc-lang/Makefile
+ sed -i 's|LDFLAGS =.*|LDFLAGS =|' fc-arch/Makefile
+
+ sed -i 's|CFLAGS =.*|CFLAGS =${BUILD_CFLAGS}|' fc-case/Makefile
+ sed -i 's|CFLAGS =.*|CFLAGS =${BUILD_CFLAGS}|' fc-glyphname/Makefile
+ sed -i 's|CFLAGS =.*|CFLAGS =${BUILD_CFLAGS}|' fc-lang/Makefile
+ sed -i 's|CFLAGS =.*|CFLAGS =${BUILD_CFLAGS}|' fc-arch/Makefile
+
+ sed -i 's|CPPFLAGS =.*|CPPFLAGS =${BUILD_CPPFLAGS}|' fc-case/Makefile
+ sed -i 's|CPPFLAGS =.*|CPPFLAGS =${BUILD_CPPFLAGS}|' fc-glyphname/Makefile
+ sed -i 's|CPPFLAGS =.*|CPPFLAGS =${BUILD_CPPFLAGS}|' fc-lang/Makefile
+ sed -i 's|CPPFLAGS =.*|CPPFLAGS =${BUILD_CPPFLAGS}|' fc-arch/Makefile
+
+ sed -i 's|CXXFLAGS =.*|CFLAGS =${BUILD_CXXFLAGS}|' fc-case/Makefile
+ sed -i 's|CXXFLAGS =.*|CFLAGS =${BUILD_CXXFLAGS}|' fc-glyphname/Makefile
+ sed -i 's|CXXFLAGS =.*|CFLAGS =${BUILD_CXXFLAGS}|' fc-lang/Makefile
+ sed -i 's|CXXFLAGS =.*|CFLAGS =${BUILD_CXXFLAGS}|' fc-arch/Makefile
+
+}
+
+do_install () {
+ autotools_do_install
+}
+
============================================================
--- packages/gsoap/gsoap-native/use-just-built-binary.patch 3494a4c5a9654fc35b3d6f43f4b3cf74187df695
+++ packages/gsoap/gsoap-native/use-just-built-binary.patch 3494a4c5a9654fc35b3d6f43f4b3cf74187df695
@@ -0,0 +1,19 @@
+---
+ soapcpp2/wsdl/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- gsoap-2.7.orig/soapcpp2/wsdl/Makefile.am
++++ gsoap-2.7/soapcpp2/wsdl/Makefile.am
+@@ -13,11 +13,11 @@ SOAP_CPP_SRC=wsdlC.cpp
+ SOAPHEADER=wsdl.h
+ SOAP_FLAGS=-SC -pwsdl
+ BUILT_SOURCES=$(SOAP_CPP_SRC)
+
+ $(SOAP_CPP_SRC) : $(SOAPHEADER)
+- $(SOAP) $(SOAP_FLAGS) $(SOAPHEADER)
++ ../src/soapcpp2 $(SOAP_FLAGS) $(SOAPHEADER)
+
+ #LIBS=
+
+ bin_PROGRAMS=wsdl2h
+
============================================================
--- packages/kexecboot/kexecboot_0.3.bb 0ca1d7664f36aed1936462e2c084e6fb1fcfcece
+++ packages/kexecboot/kexecboot_0.3.bb 0ca1d7664f36aed1936462e2c084e6fb1fcfcece
@@ -0,0 +1,19 @@
+LICENSE = "GPL"
+PR = "r0"
+DEPENDS = "klibc"
+inherit autotools
+
+# You can create your own *-img.h by doing
+# ./make-image-header.sh%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list