diff options
| author | Marcin Juszkiewicz <hrw@openembedded.org> | 2007-04-04 17:18:32 +0000 |
|---|---|---|
| committer | Marcin Juszkiewicz <hrw@openembedded.org> | 2007-04-04 17:18:32 +0000 |
| commit | 448810d9f975b603c78344d00bb3faa4cc7f02a7 (patch) | |
| tree | a8325dd0f17a5a086df57b08a369ad29f1baea60 | |
| parent | 592037954fa805b29254404bca6466bd8087fafb (diff) | |
| parent | c72b4cf97ca4e3b5cad4b9e51dee4d571b7e5e0a (diff) | |
merge of '2dedd269e3ce065dd32e2397e0e647b83f2a26ee'
and '3b9a62d13a4d7a58079179c6df892a56648121f5'
| -rw-r--r-- | packages/libol/libol_0.3.18.bb | 6 | ||||
| -rw-r--r-- | packages/zip/zip-native_2.32.bb | 5 | ||||
| -rw-r--r-- | packages/zip/zip.inc | 5 | ||||
| -rw-r--r-- | packages/zip/zip_2.32.bb | 3 |
4 files changed, 11 insertions, 8 deletions
diff --git a/packages/libol/libol_0.3.18.bb b/packages/libol/libol_0.3.18.bb index 9484f8e99e..b8ad9b30ac 100644 --- a/packages/libol/libol_0.3.18.bb +++ b/packages/libol/libol_0.3.18.bb @@ -1,15 +1,13 @@ -PR = "r6" +PR = "r7" SRC_URI = "http://www.balabit.com/downloads/libol/0.3/${P}.tar.gz" S = "${WORKDIR}/${PN}-${PV}" -inherit autotools +inherit autotools binconfig do_stage() { - install -d ${STAGING_BINDIR_CROSS} install -d ${STAGING_INCDIR}/libol - install -m 0755 ${S}/libol-config ${STAGING_BINDIR_CROSS}/ install -m 0755 ${S}/src/.libs/libol.so.0.0.0 ${STAGING_LIBDIR}/ ln -fs ${STAGING_LIBDIR}/libol.so.0.0.0 ${STAGING_LIBDIR}/libol.so.0 install ${S}/src/*.h ${STAGING_INCDIR}/libol/ diff --git a/packages/zip/zip-native_2.32.bb b/packages/zip/zip-native_2.32.bb index fde61efcb7..cfa4272378 100644 --- a/packages/zip/zip-native_2.32.bb +++ b/packages/zip/zip-native_2.32.bb @@ -1,6 +1,7 @@ -SECTION = "console/utils" -inherit native require zip_${PV}.bb + +inherit native + S = "${WORKDIR}/zip-${PV}" do_stage() { diff --git a/packages/zip/zip.inc b/packages/zip/zip.inc index b66b4b217f..8d04bd5f61 100644 --- a/packages/zip/zip.inc +++ b/packages/zip/zip.inc @@ -1,6 +1,9 @@ +DESCRIPTION = "Archiver for .zip files" SECTION = "console/utils" -SRC_URI = "http://ftp.info-zip.org/pub/infozip/src/zip${@bb.data.getVar('PV',d,1).replace('.', '')}.tar.gz" LICENSE = "Info-ZIP" + +SRC_URI = "http://ftp.info-zip.org/pub/infozip/src/zip${@bb.data.getVar('PV',d,1).replace('.', '')}.tar.gz" + EXTRA_OEMAKE = "'CC=${CC}' 'BIND=${CC}' 'AS=${CC} -c' 'CPP=${CPP}' \ 'CFLAGS=-I. -DUNIX ${CFLAGS}' 'INSTALL=install' \ 'BINFLAGS=0755' 'INSTALL_D=install -d'" diff --git a/packages/zip/zip_2.32.bb b/packages/zip/zip_2.32.bb index b8c4ae9da0..4e01db84c7 100644 --- a/packages/zip/zip_2.32.bb +++ b/packages/zip/zip_2.32.bb @@ -1,2 +1,3 @@ require zip.inc -PR="r0" + +PR="r1" |