Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- [PATCH] grep: convert to BBCLASSEXTEND and cleanup
- convert to BBCLASSEXTEND
- unify with grep.inc
- ---
- recipes/grep/grep-native_2.5.1.bb | 16 ----------------
- recipes/grep/grep.inc | 17 +++++++++++++++++
- recipes/grep/grep_2.5.1.bb | 17 +++--------------
- recipes/grep/grep_2.5.bb | 16 +++-------------
- 4 files changed, 23 insertions(+), 43 deletions(-)
- delete mode 100644 recipes/grep/grep-native_2.5.1.bb
- create mode 100644 recipes/grep/grep.inc
- diff --git a/recipes/grep/grep-native_2.5.1.bb b/recipes/grep/grep-native_2.5.1.bb
- deleted file mode 100644
- index 51a9932..0000000
- --- a/recipes/grep/grep-native_2.5.1.bb
- +++ /dev/null
- @@ -1,16 +0,0 @@
- -require grep_${PV}.bb
- -inherit native
- -
- -S = "${WORKDIR}/grep-${PV}"
- -
- -do_stage () {
- - install -d ${STAGING_BINDIR}
- - install -m 755 src/grep ${STAGING_BINDIR}
- - install -m 755 src/egrep ${STAGING_BINDIR}
- - install -m 755 src/fgrep ${STAGING_BINDIR}
- -}
- -
- -FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/grep-${PV}"
- -
- -SRC_URI[md5sum] = "ddd99e2d5d4f4611357e31e97f080cf2"
- -SRC_URI[sha256sum] = "fca0532a4b58021863b6673dc65b275f3e34cafd3b327dcf47da265af359778a"
- diff --git a/recipes/grep/grep.inc b/recipes/grep/grep.inc
- new file mode 100644
- index 0000000..b77a810
- --- /dev/null
- +++ b/recipes/grep/grep.inc
- @@ -0,0 +1,17 @@
- +LICENSE = "GPL"
- +SECTION = "console/utils"
- +DESCRIPTION = "grep GNU utility"
- +INC_PR = "r3"
- +
- +BBCLASSEXTEND = "native"
- +
- +inherit autotools gettext
- +
- +SRC_URI = "${GNU_MIRROR}/grep/grep-${PV}.tar.bz2"
- +
- +EXTRA_OECONF = "--disable-perl-regexp --disable-ncurses"
- +
- +do_configure() {
- + rm -f ${S}/m4/init.m4
- + autotools_do_configure
- +}
- diff --git a/recipes/grep/grep_2.5.1.bb b/recipes/grep/grep_2.5.1.bb
- index be954a6..ecf5308 100644
- --- a/recipes/grep/grep_2.5.1.bb
- +++ b/recipes/grep/grep_2.5.1.bb
- @@ -1,19 +1,8 @@
- -LICENSE = "GPL"
- -SECTION = "console/utils"
- -DESCRIPTION = "grep GNU utility"
- -PR = "r2"
- +include grep.inc
- -SRC_URI = "${GNU_MIRROR}/grep/grep-${PV}.tar.bz2 \
- - file://uclibc-fix.patch"
- +PR = "${INC_PR}.0"
- -inherit autotools
- -
- -EXTRA_OECONF = "--disable-perl-regexp --disable-ncurses"
- -
- -do_configure () {
- - rm -f ${S}/m4/init.m4
- - autotools_do_configure
- -}
- +SRC_URI += "file://uclibc-fix.patch"
- do_install () {
- autotools_do_install
- diff --git a/recipes/grep/grep_2.5.bb b/recipes/grep/grep_2.5.bb
- index 92e5d9f..e60db9c 100644
- --- a/recipes/grep/grep_2.5.bb
- +++ b/recipes/grep/grep_2.5.bb
- @@ -1,18 +1,8 @@
- -LICENSE = "GPL"
- -SECTION = "console/utils"
- -DESCRIPTION = "grep GNU utility"
- +include grep.inc
- -SRC_URI = "${GNU_MIRROR}/grep/grep-${PV}.tar.bz2 \
- - file://install.patch"
- +PR = "${INC_PR}.0"
- -inherit autotools
- -
- -EXTRA_OECONF = "--disable-perl-regexp --disable-ncurses"
- -
- -do_configure () {
- - rm -f ${S}/m4/init.m4
- - autotools_do_configure
- -}
- +SRC_URI += "file://install.patch"
- SRC_URI[md5sum] = "5e7bd36e089b637ab3795354ec25dcae"
- SRC_URI[sha256sum] = "cb47ab7e7e472e1cb27948d2ce055632ad68557f5ed5af989278e43117a611cd"
- --
- 1.7.0.4
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement