diff options
| author | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2008-03-21 15:48:29 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2008-03-21 15:48:29 +0000 |
| commit | d4b4ea8a4cafb8a41843e62c618b5e9ca652c37d (patch) | |
| tree | f321da860b044ac53d5fc942e923f19535c48312 | |
| parent | d1e1b0fa8a08cb717206a3a2fbc0fa0b2f4f68fd (diff) | |
| parent | 9c6043280dda581f25c502be1c776babf4ec51f3 (diff) | |
merge of 'ad35118024f3b76889242bd536bd859675845efd'
and 'f1f02c875914c0bfe542289381d12559c4843ff7'
| -rw-r--r-- | packages/glib-2.0/glib-2.0-2.16.1/gcc-4.2-inline-fix.patch | 13 | ||||
| -rw-r--r-- | packages/glib-2.0/glib-2.0_2.16.1.bb | 1 | ||||
| -rw-r--r-- | packages/images/initramfs-bootmenu-image.bb | 2 | ||||
| -rw-r--r-- | packages/images/initramfs-image.bb | 2 | ||||
| -rw-r--r-- | packages/images/liveramdisk-image.bb | 2 |
5 files changed, 17 insertions, 3 deletions
diff --git a/packages/glib-2.0/glib-2.0-2.16.1/gcc-4.2-inline-fix.patch b/packages/glib-2.0/glib-2.0-2.16.1/gcc-4.2-inline-fix.patch new file mode 100644 index 0000000000..d6cbeeb8a4 --- /dev/null +++ b/packages/glib-2.0/glib-2.0-2.16.1/gcc-4.2-inline-fix.patch @@ -0,0 +1,13 @@ +Index: glib-2.16.1/glib/gutils.h +=================================================================== +--- glib-2.16.1.orig/glib/gutils.h 2008-03-21 16:18:57.000000000 +0100 ++++ glib-2.16.1/glib/gutils.h 2008-03-21 16:19:09.000000000 +0100 +@@ -97,7 +97,7 @@ + # define G_INLINE_FUNC + # undef G_CAN_INLINE + #elif defined (__GNUC__) +-# ifdef __GNUC_STDC_INLINE__ ++# ifdef __GNUC_GNU_INLINE__ + # define G_INLINE_FUNC extern inline __attribute__ ((__gnu_inline__)) + # else + # define G_INLINE_FUNC extern inline diff --git a/packages/glib-2.0/glib-2.0_2.16.1.bb b/packages/glib-2.0/glib-2.0_2.16.1.bb index 08ff056c80..111b3f59e3 100644 --- a/packages/glib-2.0/glib-2.0_2.16.1.bb +++ b/packages/glib-2.0/glib-2.0_2.16.1.bb @@ -3,4 +3,5 @@ require glib.inc SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.16/glib-${PV}.tar.bz2 \ file://glibconfig-sysdefs.h \ file://configure-libtool.patch;patch=1 \ + file://gcc-4.2-inline-fix.patch;patch=1 \ " diff --git a/packages/images/initramfs-bootmenu-image.bb b/packages/images/initramfs-bootmenu-image.bb index dd4f4d8ef6..c00efcfa2f 100644 --- a/packages/images/initramfs-bootmenu-image.bb +++ b/packages/images/initramfs-bootmenu-image.bb @@ -7,7 +7,7 @@ IMAGE_LINGUAS = "" # Remove any kernel-image that the kernel-module-* packages may have pulled in. PACKAGE_REMOVE = "kernel-image-* update-modules module-init-tools-depmod uclibc update-rc.d" -ROOTFS_POSTPROCESS_COMMAND += "ipkg-cl ${IPKG_ARGS} -force-depends \ +ROOTFS_POSTPROCESS_COMMAND += "opkg-cl ${IPKG_ARGS} -force-depends \ remove ${PACKAGE_REMOVE};" IMAGE_FSTYPES += " cpio.gz " diff --git a/packages/images/initramfs-image.bb b/packages/images/initramfs-image.bb index 162e6676d7..d3d1d751cf 100644 --- a/packages/images/initramfs-image.bb +++ b/packages/images/initramfs-image.bb @@ -7,7 +7,7 @@ IMAGE_LINGUAS = "" # Remove any kernel-image that the kernel-module-* packages may have pulled in. PACKAGE_REMOVE = "kernel-image-* update-modules" -ROOTFS_POSTPROCESS_COMMAND += "ipkg-cl ${IPKG_ARGS} -force-depends \ +ROOTFS_POSTPROCESS_COMMAND += "opkg-cl ${IPKG_ARGS} -force-depends \ remove ${PACKAGE_REMOVE};" inherit image diff --git a/packages/images/liveramdisk-image.bb b/packages/images/liveramdisk-image.bb index 5d2362353b..49af33c4ed 100644 --- a/packages/images/liveramdisk-image.bb +++ b/packages/images/liveramdisk-image.bb @@ -16,7 +16,7 @@ export IMAGE_LINGUAS = "" # Remove any kernel-image that the kernel-module-* packages may have pulled in. PACKAGE_REMOVE = "kernel-image-* update-modules module-init-tools-depmod uclibc update-rc.d" -ROOTFS_POSTPROCESS_COMMAND += "ipkg-cl ${IPKG_ARGS} -force-depends \ +ROOTFS_POSTPROCESS_COMMAND += "opkg-cl ${IPKG_ARGS} -force-depends \ remove ${PACKAGE_REMOVE};" inherit image |