Return-Path: Received: from mail-wr1-f53.google.com (mail-wr1-f53.google.com [209.85.221.53]) by mail.openembedded.org (Postfix) with ESMTP id 720177D458 for ; Wed, 1 May 2019 12:51:15 +0000 (UTC) Received: by mail-wr1-f53.google.com with SMTP id f7so15988532wrs.2 for ; Wed, 01 May 2019 05:51:16 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=F9pBsDHQRD+SDZKuXqPGuiN6BMGjMADN3CN/xQO3HEg=; b=H9Xx8U28j0PVxVONnGuL+g+fZXBfHtxk7meeAOWThMGeXvDN6T/CnmrbK82VxL80Kg Mif2dwxn3PX4VO1lRFV8huMIHFs7xhe5Ix+P6RmLjs0dtmThrWtsL5ij+4ifTlnUf7XL lKiS9pF81mHGXjMsqwYOvHtd0O3JgKlgBeu0czYg5SWDvY6Gq6y8KQrjno/Uuu+jNYdX 5voPSonQllLbJ0juQJu5hkjIh1C1uboQ6EVS7Ekp1Ch+qZprhqIW9U/3gZTrW3sbgaeR ZMlCPkN/D5kDchuHwQCJfdS9PUYJtiY02FYwuvpf4WKHo/3e5wEsUZzAU2RsIGnatFnv F6ZQ== X-Gm-Message-State: APjAAAX+4QKMbo/693iKdO0yvIjrEBGukMWIK8GJ443t/zdVhvz0bIhN LSAnU4XEOKqvW/ZF+RGnchpnMzA= X-Google-Smtp-Source: APXvYqzNtnuVi9fiu94bVm6pdOoXnIUuUC/SuqHm0MSS0hZPYijo5Asr8dyN1cWWX4uLwL/tIJ2kZg== X-Received: by 2002:a5d:4111:: with SMTP id l17mr27933918wrp.242.1556715075518; Wed, 01 May 2019 05:51:15 -0700 (PDT) Received: from bill-the-cat.local (cpe-65-184-141-147.ec.res.rr.com. [65.184.141.147]) by smtp.gmail.com with ESMTPSA id n6sm5677646wmn.48.2019.05.01.05.51.13 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 01 May 2019 05:51:14 -0700 (PDT) From: Tom Rini To: openembedded-core@lists.openembedded.org Date: Wed, 1 May 2019 08:51:08 -0400 Message-Id: <1556715069-14366-1-git-send-email-trini@konsulko.com> X-Mailer: git-send-email 2.7.4 Subject: [PATCHv2 1/2] vim: Rework to not rely on relative directories X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 May 2019 12:51:16 -0000 The vim recipe has all of the code inside the "src" subdirectory but other things we rely on, such as the license file in a subdirectory relative to the src. However, as there is a top-level "configure" script that moves us down to the src directory, we can rework the recipe to be overall more simple and regularly laid out if we use that. Signed-off-by: Tom Rini --- meta/recipes-support/vim/vim-tiny_8.1.1017.bb | 2 +- meta/recipes-support/vim/vim_8.1.1017.bb | 18 ++++++++++-------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/meta/recipes-support/vim/vim-tiny_8.1.1017.bb b/meta/recipes-support/vim/vim-tiny_8.1.1017.bb index 8b1fb7b1158d..74464833adb5 100644 --- a/meta/recipes-support/vim/vim-tiny_8.1.1017.bb +++ b/meta/recipes-support/vim/vim-tiny_8.1.1017.bb @@ -8,7 +8,7 @@ ALTERNATIVE_${PN}_remove = "xxd" PACKAGECONFIG += "tiny" do_install() { - install -D -m 0755 ${S}/vim ${D}/${bindir}/vim.tiny + install -D -m 0755 ${S}/src/vim ${D}/${bindir}/vim.tiny } ALTERNATIVE_PRIORITY = "90" diff --git a/meta/recipes-support/vim/vim_8.1.1017.bb b/meta/recipes-support/vim/vim_8.1.1017.bb index 7627d2844b79..4e3e663c5429 100644 --- a/meta/recipes-support/vim/vim_8.1.1017.bb +++ b/meta/recipes-support/vim/vim_8.1.1017.bb @@ -6,16 +6,16 @@ DEPENDS = "ncurses gettext-native" # vimdiff doesn't like busybox diff RSUGGESTS_${PN} = "diffutils" LICENSE = "vim" -LIC_FILES_CHKSUM = "file://../runtime/doc/uganda.txt;endline=287;md5=f1f82b42360005c70b8c19b0ef493f72" +LIC_FILES_CHKSUM = "file://runtime/doc/uganda.txt;endline=287;md5=f1f82b42360005c70b8c19b0ef493f72" SRC_URI = "git://github.com/vim/vim.git \ - file://disable_acl_header_check.patch;patchdir=.. \ - file://vim-add-knob-whether-elf.h-are-checked.patch;patchdir=.. \ - file://0001-src-Makefile-improve-reproducibility.patch;patchdir=.. \ + file://disable_acl_header_check.patch \ + file://vim-add-knob-whether-elf.h-are-checked.patch \ + file://0001-src-Makefile-improve-reproducibility.patch \ " SRCREV = "493fbe4abee660d30b4f2aef87b754b0a720213c" -S = "${WORKDIR}/git/src" +S = "${WORKDIR}/git" VIMDIR = "vim${@d.getVar('PV').split('.')[0]}${@d.getVar('PV').split('.')[1]}" @@ -25,13 +25,15 @@ CLEANBROKEN = "1" # vim configure.in contains functions which got 'dropped' by autotools.bbclass do_configure () { + cd src rm -f auto/* touch auto/config.mk aclocal autoconf + cd .. oe_runconf - touch auto/configure - touch auto/config.mk auto/config.h + touch src/auto/configure + touch src/auto/config.mk src/auto/config.h } #Available PACKAGECONFIG options are gtkgui, acl, x11, tiny @@ -76,7 +78,7 @@ do_install() { chmod -x ${D}${datadir}/${BPN}/${VIMDIR}/tools/*.py # Install example vimrc from runtime files - install -m 0644 ../runtime/vimrc_example.vim ${D}/${datadir}/${BPN}/vimrc + install -m 0644 runtime/vimrc_example.vim ${D}/${datadir}/${BPN}/vimrc # we use --with-features=big as default mv ${D}${bindir}/${BPN} ${D}${bindir}/${BPN}.${BPN} -- 2.7.4