From 03bff3867e46d875ead27be7c66381c1aa994507 Mon Sep 17 00:00:00 2001 From: necrophcodr Date: Mon, 19 Jan 2015 14:48:54 +0100 Subject: [PATCH] bananapi-uboot: Move bananapi-base/files directory to bananapi-uboot. bananapi-uboot: Add conf_files description. bananapi-base: Move installation and compilation of boot files to bananapi-uboot. --- srcpkgs/bananapi-base/template | 6 ------ .../{bananapi-base => bananapi-uboot}/files/script.fex | 0 .../{bananapi-base => bananapi-uboot}/files/uEnv.txt | 0 srcpkgs/bananapi-uboot/template | 10 ++++++++++ 4 files changed, 10 insertions(+), 6 deletions(-) rename srcpkgs/{bananapi-base => bananapi-uboot}/files/script.fex (100%) rename srcpkgs/{bananapi-base => bananapi-uboot}/files/uEnv.txt (100%) diff --git a/srcpkgs/bananapi-base/template b/srcpkgs/bananapi-base/template index 418ab2b6cb8..394025185ed 100644 --- a/srcpkgs/bananapi-base/template +++ b/srcpkgs/bananapi-base/template @@ -21,10 +21,4 @@ do_install() { vmkdir usr/lib/udev/rules.d echo 'KERNEL=="disp|cedar_dev|mali|ump", MODE="0660", GROUP="video"' > ${DESTDIR}/usr/lib/udev/rules.d/50-bpi-video.rules - # Certain files in `files` directory *NEED* to be installed. - # uEnv.txt: The boot configuration file, in pure text for readability. - # script.fex: Pure text board configuration, compiled to script.bin. - vmkdir boot - cp ${FILESDIR}/uEnv.txt ${DESTDIR}/boot/ - fexc ${FILESDIR}/script.fex ${DESTDIR}/boot/script.bin } diff --git a/srcpkgs/bananapi-base/files/script.fex b/srcpkgs/bananapi-uboot/files/script.fex similarity index 100% rename from srcpkgs/bananapi-base/files/script.fex rename to srcpkgs/bananapi-uboot/files/script.fex diff --git a/srcpkgs/bananapi-base/files/uEnv.txt b/srcpkgs/bananapi-uboot/files/uEnv.txt similarity index 100% rename from srcpkgs/bananapi-base/files/uEnv.txt rename to srcpkgs/bananapi-uboot/files/uEnv.txt diff --git a/srcpkgs/bananapi-uboot/template b/srcpkgs/bananapi-uboot/template index 1818733edcc..b0ef07769dd 100644 --- a/srcpkgs/bananapi-uboot/template +++ b/srcpkgs/bananapi-uboot/template @@ -11,6 +11,8 @@ distfiles="https://github.com/Bananian/u-boot-bananapi/archive/bananian-v${versi checksum="935ac90624cc00106a1547b8da2b3e59ab09db9cf658df7126a93738fac74fe5" wrksrc="u-boot-bananapi-bananian-v${version}" +conf_files="/boot/uEnv.txt" + only_for_archs="armv7l" do_configure() { @@ -26,8 +28,16 @@ do_build() { else make ARCH=arm fi + } do_install() { + # Certain files in `files` directory *NEED* to be installed. + # uEnv.txt: The boot configuration file, in pure text for readability. + # script.fex: Pure text board configuration, compiled to script.bin. + vmkdir boot + cp ${FILESDIR}/uEnv.txt ${DESTDIR}/boot/ + fexc ${FILESDIR}/script.fex ${DESTDIR}/boot/script.bin + vinstall u-boot.bin 600 boot }