diff options
| author | Marcin Juszkiewicz <hrw@openembedded.org> | 2007-02-22 21:18:24 +0000 |
|---|---|---|
| committer | Marcin Juszkiewicz <hrw@openembedded.org> | 2007-02-22 21:18:24 +0000 |
| commit | 6eff3e818bd223b63a399c5f59532da1032610e4 (patch) | |
| tree | d2b05da1fcbe074586b7568d7fea2b0d091ccf05 | |
| parent | cdfbb4a1011c0064e85273ab97a0eb841d3b1086 (diff) | |
e2fsprogs: unbreak -native version, move common code to .inc from 1.38.bb
| -rw-r--r-- | packages/e2fsprogs/e2fsprogs-native_1.38.bb | 15 | ||||
| -rw-r--r-- | packages/e2fsprogs/e2fsprogs.inc | 6 | ||||
| -rw-r--r-- | packages/e2fsprogs/e2fsprogs_1.38.bb | 3 |
3 files changed, 8 insertions, 16 deletions
diff --git a/packages/e2fsprogs/e2fsprogs-native_1.38.bb b/packages/e2fsprogs/e2fsprogs-native_1.38.bb index 8d1d580c90..dcb5c412d0 100644 --- a/packages/e2fsprogs/e2fsprogs-native_1.38.bb +++ b/packages/e2fsprogs/e2fsprogs-native_1.38.bb @@ -1,20 +1,13 @@ SECTION = "base" -require e2fsprogs_${PV}.bb +require e2fsprogs.inc inherit native +EXTRA_OECONF = "" + FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/e2fsprogs-${PV}', '${FILE_DIRNAME}/e2fsprogs', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" PACKAGES = "" DEPENDS = "" do_stage () { - oe_libinstall -a -C lib libe2p ${STAGING_LIBDIR}/ - oe_libinstall -a -C lib libext2fs ${STAGING_LIBDIR}/ - install -d ${STAGING_INCDIR}/e2p - for h in ${e2pheaders}; do - install -m 0644 lib/e2p/$h ${STAGING_INCDIR}/e2p/ || die "failed to install $h" - done - install -d ${STAGING_INCDIR}/ext2fs - for h in ${ext2fsheaders}; do - install -m 0644 lib/ext2fs/$h ${STAGING_INCDIR}/ext2fs/ || die "failed to install $h" - done + oe_runmake install } diff --git a/packages/e2fsprogs/e2fsprogs.inc b/packages/e2fsprogs/e2fsprogs.inc index cd8014a759..f209baf3b4 100644 --- a/packages/e2fsprogs/e2fsprogs.inc +++ b/packages/e2fsprogs/e2fsprogs.inc @@ -5,8 +5,10 @@ SECTION = "base" SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-${PV}.tar.gz" -inherit autotools pkgconfig +S = "${WORKDIR}/e2fsprogs-${PV}" -EXTRA_OECONF = " --enable-dynamic-e2fsck" +inherit autotools +EXTRA_OECONF = " --enable-dynamic-e2fsck" +PARALLEL_MAKE = "" diff --git a/packages/e2fsprogs/e2fsprogs_1.38.bb b/packages/e2fsprogs/e2fsprogs_1.38.bb index 32e5f7b534..2e8bf3d219 100644 --- a/packages/e2fsprogs/e2fsprogs_1.38.bb +++ b/packages/e2fsprogs/e2fsprogs_1.38.bb @@ -3,9 +3,6 @@ require e2fsprogs.inc PR = "r8" SRC_URI += "file://no-hardlinks.patch;patch=1" -S = "${WORKDIR}/e2fsprogs-${PV}" - -PARALLEL_MAKE = "" EXTRA_OECONF += " --sbindir=${base_sbindir}" |