Advertisement
Guest User

Untitled

a guest
May 28th, 2017
78
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 3.05 KB | None | 0 0
  1. [PATCH] grep: convert to BBCLASSEXTEND and cleanup
  2.  
  3. convert to BBCLASSEXTEND
  4. unify with grep.inc
  5. ---
  6. recipes/grep/grep-native_2.5.1.bb |   16 ----------------
  7.  recipes/grep/grep.inc             |   17 +++++++++++++++++
  8.  recipes/grep/grep_2.5.1.bb        |   17 +++--------------
  9.  recipes/grep/grep_2.5.bb          |   16 +++-------------
  10.  4 files changed, 23 insertions(+), 43 deletions(-)
  11.  delete mode 100644 recipes/grep/grep-native_2.5.1.bb
  12.  create mode 100644 recipes/grep/grep.inc
  13.  
  14. diff --git a/recipes/grep/grep-native_2.5.1.bb b/recipes/grep/grep-native_2.5.1.bb
  15. deleted file mode 100644
  16. index 51a9932..0000000
  17. --- a/recipes/grep/grep-native_2.5.1.bb
  18. +++ /dev/null
  19. @@ -1,16 +0,0 @@
  20. -require grep_${PV}.bb
  21. -inherit native
  22. -
  23. -S = "${WORKDIR}/grep-${PV}"
  24. -
  25. -do_stage () {
  26. -   install -d ${STAGING_BINDIR}
  27. -   install -m 755 src/grep ${STAGING_BINDIR}
  28. -   install -m 755 src/egrep ${STAGING_BINDIR}
  29. -   install -m 755 src/fgrep ${STAGING_BINDIR}
  30. -}
  31. -
  32. -FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/grep-${PV}"
  33. -
  34. -SRC_URI[md5sum] = "ddd99e2d5d4f4611357e31e97f080cf2"
  35. -SRC_URI[sha256sum] = "fca0532a4b58021863b6673dc65b275f3e34cafd3b327dcf47da265af359778a"
  36. diff --git a/recipes/grep/grep.inc b/recipes/grep/grep.inc
  37. new file mode 100644
  38. index 0000000..b77a810
  39. --- /dev/null
  40. +++ b/recipes/grep/grep.inc
  41. @@ -0,0 +1,17 @@
  42. +LICENSE = "GPL"
  43. +SECTION = "console/utils"
  44. +DESCRIPTION = "grep GNU utility"
  45. +INC_PR = "r3"
  46. +
  47. +BBCLASSEXTEND = "native"
  48. +
  49. +inherit autotools gettext
  50. +
  51. +SRC_URI = "${GNU_MIRROR}/grep/grep-${PV}.tar.bz2"
  52. +
  53. +EXTRA_OECONF = "--disable-perl-regexp --disable-ncurses"
  54. +
  55. +do_configure() {
  56. +   rm -f ${S}/m4/init.m4
  57. +   autotools_do_configure
  58. +}
  59. diff --git a/recipes/grep/grep_2.5.1.bb b/recipes/grep/grep_2.5.1.bb
  60. index be954a6..ecf5308 100644
  61. --- a/recipes/grep/grep_2.5.1.bb
  62. +++ b/recipes/grep/grep_2.5.1.bb
  63. @@ -1,19 +1,8 @@
  64. -LICENSE = "GPL"
  65. -SECTION = "console/utils"
  66. -DESCRIPTION = "grep GNU utility"
  67. -PR = "r2"
  68. +include grep.inc
  69.  
  70. -SRC_URI = "${GNU_MIRROR}/grep/grep-${PV}.tar.bz2 \
  71. -           file://uclibc-fix.patch"
  72. +PR = "${INC_PR}.0"
  73.  
  74. -inherit autotools
  75. -
  76. -EXTRA_OECONF = "--disable-perl-regexp --disable-ncurses"
  77. -
  78. -do_configure () {
  79. -   rm -f ${S}/m4/init.m4
  80. -   autotools_do_configure
  81. -}
  82. +SRC_URI += "file://uclibc-fix.patch"
  83.  
  84.  do_install () {
  85.     autotools_do_install
  86. diff --git a/recipes/grep/grep_2.5.bb b/recipes/grep/grep_2.5.bb
  87. index 92e5d9f..e60db9c 100644
  88. --- a/recipes/grep/grep_2.5.bb
  89. +++ b/recipes/grep/grep_2.5.bb
  90. @@ -1,18 +1,8 @@
  91. -LICENSE = "GPL"
  92. -SECTION = "console/utils"
  93. -DESCRIPTION = "grep GNU utility"
  94. +include grep.inc
  95.  
  96. -SRC_URI = "${GNU_MIRROR}/grep/grep-${PV}.tar.bz2 \
  97. -      file://install.patch"
  98. +PR = "${INC_PR}.0"
  99.  
  100. -inherit autotools
  101. -
  102. -EXTRA_OECONF = "--disable-perl-regexp --disable-ncurses"
  103. -
  104. -do_configure () {
  105. -   rm -f ${S}/m4/init.m4
  106. -   autotools_do_configure
  107. -}
  108. +SRC_URI += "file://install.patch"
  109.  
  110.  SRC_URI[md5sum] = "5e7bd36e089b637ab3795354ec25dcae"
  111.  SRC_URI[sha256sum] = "cb47ab7e7e472e1cb27948d2ce055632ad68557f5ed5af989278e43117a611cd"
  112. --
  113. 1.7.0.4
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement