diff options
| author | Phil Blundell <philb@gnu.org> | 2004-08-06 14:12:51 +0000 |
|---|---|---|
| committer | Phil Blundell <philb@gnu.org> | 2004-08-06 14:12:51 +0000 |
| commit | 1e158aea2d9bfb33d451a36d61198fcad0bc73ca (patch) | |
| tree | af4e3af1a3e5f42b2b5c616609d31f425db20963 | |
| parent | 48b7e50f7c1e95aa0a984cca4991eba6874f1747 (diff) | |
Merge bk://openembedded@openembedded.bkbits.net/packages
into stealth.(none):/home/pb/oe/oe-packages
2004/08/06 15:11:38+01:00 (none)!pb
add ${libdir}/locales to FILES_${PN}
2004/08/06 11:50:27+01:00 (none)!pb
Merge bk://openembedded@openembedded.bkbits.net/packages
into stealth.(none):/home/pb/oe/oe-packages
2004/08/06 11:47:13+01:00 (none)!pb
apply necessary .desktop changes to 0.1.12
BKrev: 411391e3ijLQQu04U5veaw4VjJ_lEA
| -rw-r--r-- | glibc/glibc_2.3.2+cvs20040726.oe | 4 | ||||
| -rw-r--r-- | glibc/glibc_cvs.oe | 4 | ||||
| -rw-r--r-- | gpe-conf/gpe-conf-0.1.12/desktop.patch | 0 | ||||
| -rw-r--r-- | gpe-conf/gpe-conf_0.1.12.oe | 23 |
4 files changed, 27 insertions, 4 deletions
diff --git a/glibc/glibc_2.3.2+cvs20040726.oe b/glibc/glibc_2.3.2+cvs20040726.oe index b31d898b38..69a7aca4b9 100644 --- a/glibc/glibc_2.3.2+cvs20040726.oe +++ b/glibc/glibc_2.3.2+cvs20040726.oe @@ -1,5 +1,5 @@ FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/glibc-cvs" -PR = "r1" +PR = "r2" DESCRIPTION = "GNU C Library" LICENSE = "LGPL" SECTION = "libs" @@ -34,7 +34,7 @@ INHIBIT_DEFAULT_DEPS = "1" libc_baselibs = "/lib/libc* /lib/libm* /lib/ld* /lib/libpthread* /lib/libresolv* /lib/librt* /lib/libutil* /lib/libnsl* /lib/libnss_files* /lib/libnss_compat* /lib/libnss_dns* /lib/libdl* /lib/libanl* /lib/libBrokenLocale*" -FILES_${PN} = "${sysconfdir} ${libc_baselibs} /sbin/ldconfig ${libexecdir} ${datadir}/zoneinfo" +FILES_${PN} = "${sysconfdir} ${libc_baselibs} /sbin/ldconfig ${libexecdir} ${datadir}/zoneinfo ${libdir}/locale" FILES_ldd = "${bindir}/ldd" FILES_libsegfault = "/lib/libSegFault*" FILES_glibc-extra-nss = "/lib/libnss*" diff --git a/glibc/glibc_cvs.oe b/glibc/glibc_cvs.oe index a1b41806f5..e8385baecb 100644 --- a/glibc/glibc_cvs.oe +++ b/glibc/glibc_cvs.oe @@ -1,6 +1,6 @@ FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/glibc-cvs" PV = "2.3.2+cvs${CVSDATE}" -PR = "r9" +PR = "r10" DESCRIPTION = "GNU C Library" LICENSE = "LGPL" SECTION = "libs" @@ -37,7 +37,7 @@ INHIBIT_DEFAULT_DEPS = "1" libc_baselibs = "/lib/libc* /lib/libm* /lib/ld* /lib/libpthread* /lib/libresolv* /lib/librt* /lib/libutil* /lib/libnsl* /lib/libnss_files* /lib/libnss_compat* /lib/libnss_dns* /lib/libdl* /lib/libanl* /lib/libBrokenLocale*" -FILES_${PN} = "${sysconfdir} ${libc_baselibs} /sbin/ldconfig ${libexecdir} ${datadir}/zoneinfo" +FILES_${PN} = "${sysconfdir} ${libc_baselibs} /sbin/ldconfig ${libexecdir} ${datadir}/zoneinfo ${libdir}/locale" FILES_ldd = "${bindir}/ldd" FILES_libsegfault = "/lib/libSegFault*" FILES_glibc-extra-nss = "/lib/libnss*" diff --git a/gpe-conf/gpe-conf-0.1.12/desktop.patch b/gpe-conf/gpe-conf-0.1.12/desktop.patch new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/gpe-conf/gpe-conf-0.1.12/desktop.patch diff --git a/gpe-conf/gpe-conf_0.1.12.oe b/gpe-conf/gpe-conf_0.1.12.oe index e69de29bb2..6b5460d68f 100644 --- a/gpe-conf/gpe-conf_0.1.12.oe +++ b/gpe-conf/gpe-conf_0.1.12.oe @@ -0,0 +1,23 @@ +PR = "r1" + +inherit gpe pkgconfig + +DEPENDS = "gtk+ libgpewidget libxsettings libxsettings-client pcmcia-cs xst" +RDEPENDS = "xst" +SECTION = "gpe" +PRIORITY = "optional" +FILES_${PN} = "${sysconfdir} ${bindir} ${datadir}/pixmaps ${datadir}/applications" +FILES_${PN} += " ${datadir}/gpe/pixmaps" + +SRC_URI = "${GPE_MIRROR}/gpe-conf-${PV}.tar.gz \ + file://desktop.patch;patch=1" + +do_compile () { + oe_runmake + oe_runmake all-desktop +} + +do_install () { + oe_runmake PREFIX=${prefix} DESTDIR=${D} install-program +} + |