Re: NEW: games/2048-cli
On 08/20/17 20:15, Kaashif Hymabaccus wrote: Builds and works well on amd64 Checked that one, everything is OK. -- ~Cheers~ pipfstarrd.net pipfsta...@jabbim.com PGP KEY ID ACE8 41D8 A1B6 54C0 Keys can be retrieved at pgp.mit.edu
Re: build combined spl/uboot/dtb/atf images for Allwinner A64/H5
On Mon, Aug 21, 2017 at 11:14:48AM +1000, Jonathan Gray wrote:
> On Mon, Aug 21, 2017 at 12:53:15AM +0300, Artturi Alm wrote:
> > Hi,
> >
> > this + sysutils/atf-allwinner produced binaries i successfully used to
> > install arm64 for pine64-plus into mmc sd0 w/axen0 on usb, thanks :)
> > the .dtb i used in miniroot was from current dtb-4.12 pkg.
> >
> > -Artturi
>
> u-boot.itb/u-boot-sunxi-with-spl.bin includes dtbs.
>
> /dts-v1/;
>
> / {
> description = "Configuration to load ATF before U-Boot";
> #address-cells = <1>;
>
> images {
> uboot@1 {
> description = "U-Boot (64-bit)";
> data = /incbin/("u-boot-nodtb.bin");
> type = "standalone";
> arch = "arm64";
> compression = "none";
> load = <0x4a00>;
> };
> atf@1 {
> description = "ARM Trusted Firmware";
> data =
> /incbin/("/usr/local/share/atf-allwinner/bl31.bin");
> type = "firmware";
> arch = "arm64";
> compression = "none";
> load = <0x44000>;
> entry = <0x44000>;
> };
> fdt@1 {
> description = "sun50i-a64-pine64";
> data = /incbin/("arch/arm/dts/sun50i-a64-pine64.dtb");
> type = "flat_dt";
> compression = "none";
> };
> fdt@2 {
> description = "sun50i-a64-pine64-plus";
> data =
> /incbin/("arch/arm/dts/sun50i-a64-pine64-plus.dtb");
> type = "flat_dt";
> compression = "none";
> };
> };
> configurations {
> default = "config@1";
>
> config@1 {
> description = "sun50i-a64-pine64";
> firmware = "uboot@1";
> loadables = "atf@1";
> fdt = "fdt@1";
> };
> config@2 {
> description = "sun50i-a64-pine64-plus";
> firmware = "uboot@1";
> loadables = "atf@1";
> fdt = "fdt@2";
> };
> };
> };
oh, cool, i didn't know u-boot passes it like that, i only did "fdt header"
and downloaded .dtb to memory and wrote it to sd w/fatwrite from u-boot,
but looking at "env print" now i can see it was obviously useless indeed,
and the dtb had correctly vanished after install:)
-Artturi
INFO:PSCI Affinity Map:
INFO: AffInst: Level 0, MPID 0x0, State ON
INFO: AffInst: Level 0, MPID 0x1, State OFF
INFO: AffInst: Level 0, MPID 0x2, State OFF
INFO: AffInst: Level 0, MPID 0x3, State OFF
U-Boot SPL 2017.09-rc2 (Aug 19 2017 - 15:25:54)
DRAM: 1024 MiB
Trying to boot from MMC1
NOTICE: BL3-1: Running on A64/H64 (1689) in SRAM A2 (@0x44000)
NOTICE: Configuring SPC Controller
NOTICE: BL3-1: v1.0(debug):20170702
NOTICE: BL3-1: Built : 13:28:54, Aug 19 2017
NOTICE: Configuring AXP PMIC
NOTICE: PMIC: setup successful
NOTICE: SCPI: dummy stub handler, implementation level: 00
INFO:BL3-1: Initializing runtime services
INFO:BL3-1: Preparing for EL3 exit to normal world
INFO:BL3-1: Next image address: 0x4a00, SPSR: 0x3c9
U-Boot 2017.09-rc2 (Aug 19 2017 - 15:25:54 +1000) Allwinner Technology
CPU: Allwinner A64 (SUN50I)
Model: Pine64+
DRAM: 1 GiB
MMC: SUNXI SD/MMC: 0
*** Warning - bad CRC, using default environment
In:serial
Out: serial
Err: serial
Net: phy interface7
eth0: ethernet@01c3
starting USB...
USB0: USB EHCI 1.00
USB1: USB OHCI 1.0
scanning bus 0 for devices... 2 USB Device(s) found
scanning usb for storage devices... 0 Storage Device(s) found
Hit any key to stop autoboot: 0
=> fdt header
No FDT memory address configured. Please configure
the FDT address via "fdt addr " command.
Aborting!
=> bdinfo
arch_number = 0x
boot_params = 0x4100
DRAM bank = 0x
-> start= 0x4000
-> size = 0x4000
baudrate= 115200 bps
TLB addr= 0x7FFF
relocaddr = 0x7DF59000
reloc off = 0x33F59000
irq_sp = 0x79F35CC0
sp start= 0x79F35CC0
Early malloc usage: 2e0 / 400
fdt_blob = 79f35cd8
=> fdt addr 79f35cd8
=> fdt header
magic: 0xd00dfeed
totalsize: 0x2119 (8473)
off_dt_struct: 0x38
off_dt_strings: 0x1e58
off_mem_rsvmap: 0x28
version:17
last_comp_version: 16
boot_cpuid_phys:0x0
size_dt_strings:0x2c1
size_dt_struct: 0x1e20
number mem_rsv: 0x0
=>
Re: build combined spl/uboot/dtb/atf images for Allwinner A64/H5
On Mon, Aug 21, 2017 at 12:53:15AM +0300, Artturi Alm wrote:
> Hi,
>
> this + sysutils/atf-allwinner produced binaries i successfully used to
> install arm64 for pine64-plus into mmc sd0 w/axen0 on usb, thanks :)
> the .dtb i used in miniroot was from current dtb-4.12 pkg.
>
> -Artturi
u-boot.itb/u-boot-sunxi-with-spl.bin includes dtbs.
/dts-v1/;
/ {
description = "Configuration to load ATF before U-Boot";
#address-cells = <1>;
images {
uboot@1 {
description = "U-Boot (64-bit)";
data = /incbin/("u-boot-nodtb.bin");
type = "standalone";
arch = "arm64";
compression = "none";
load = <0x4a00>;
};
atf@1 {
description = "ARM Trusted Firmware";
data =
/incbin/("/usr/local/share/atf-allwinner/bl31.bin");
type = "firmware";
arch = "arm64";
compression = "none";
load = <0x44000>;
entry = <0x44000>;
};
fdt@1 {
description = "sun50i-a64-pine64";
data = /incbin/("arch/arm/dts/sun50i-a64-pine64.dtb");
type = "flat_dt";
compression = "none";
};
fdt@2 {
description = "sun50i-a64-pine64-plus";
data =
/incbin/("arch/arm/dts/sun50i-a64-pine64-plus.dtb");
type = "flat_dt";
compression = "none";
};
};
configurations {
default = "config@1";
config@1 {
description = "sun50i-a64-pine64";
firmware = "uboot@1";
loadables = "atf@1";
fdt = "fdt@1";
};
config@2 {
description = "sun50i-a64-pine64-plus";
firmware = "uboot@1";
loadables = "atf@1";
fdt = "fdt@2";
};
};
};
fix httpd.conf sample in nextcloud
Hi,
Someone reported on irc that nextcloud's README was wrong because it
says for httpd
# cp /var/www/conf/modules.sample/httpd-nextcloud.conf /etc/
while the file is for apache2. Indeed:
/var/www/conf/modules.sample$ sha256 *
SHA256 (apache-nextcloud.conf) =
6518b5303fb11240c78dc1d16f81e4935ca7bdbb575b01b40bea0f1f1327d732
SHA256 (apache-nextcloud.conf.dist) =
6518b5303fb11240c78dc1d16f81e4935ca7bdbb575b01b40bea0f1f1327d732
SHA256 (httpd-nextcloud.conf) =
6518b5303fb11240c78dc1d16f81e4935ca7bdbb575b01b40bea0f1f1327d732
SHA256 (httpd-nextcloud.conf.dist) =
07c7966f0e20113f8f2e1ededac75b447c36290386ce88901e26669bd80440e2
SHA256 (php-5.6.conf) =
6395872b7844b0ccd766f9191cd0a4c918288df59ead2b58adf02da421d9559a
the problem comes from the PLIST order it seems, after my patch:
/var/www/conf/modules.sample$ sha256 *
SHA256 (apache-nextcloud.conf) =
6518b5303fb11240c78dc1d16f81e4935ca7bdbb575b01b40bea0f1f1327d732
SHA256 (apache-nextcloud.conf.dist) =
6518b5303fb11240c78dc1d16f81e4935ca7bdbb575b01b40bea0f1f1327d732
SHA256 (httpd-nextcloud.conf) =
07c7966f0e20113f8f2e1ededac75b447c36290386ce88901e26669bd80440e2
SHA256 (httpd-nextcloud.conf.dist) =
07c7966f0e20113f8f2e1ededac75b447c36290386ce88901e26669bd80440e2
SHA256 (php-5.6.conf) =
6395872b7844b0ccd766f9191cd0a4c918288df59ead2b58adf02da421d9559a
Comments? OK?
Cheers,
Daniel
Index: Makefile
===
RCS file: /cvs/ports/www/nextcloud/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- Makefile 28 May 2017 20:03:16 - 1.3
+++ Makefile 21 Aug 2017 00:48:14 -
@@ -5,6 +5,7 @@ COMMENT= easy and universal access to s
V= 12.0.0
DISTNAME= nextcloud-${V}
EXTRACT_SUFX= .tar.bz2
+REVISION= 0
CATEGORIES= www
Index: pkg/PLIST
===
RCS file: /cvs/ports/www/nextcloud/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- pkg/PLIST 28 May 2017 20:03:16 - 1.3
+++ pkg/PLIST 21 Aug 2017 00:48:16 -
@@ -3,9 +3,9 @@
@unexec-delete rm -f /var/www/conf/modules/apache-nextcloud.conf
conf/modules.sample/apache-nextcloud.conf.dist
@sample /var/www/conf/modules.sample/
-@sample /var/www/conf/modules.sample/httpd-nextcloud.conf
@sample /var/www/conf/modules.sample/apache-nextcloud.conf
conf/modules.sample/httpd-nextcloud.conf.dist
+@sample /var/www/conf/modules.sample/httpd-nextcloud.conf
nextcloud/
nextcloud/.htaccess.dist
@sample nextcloud/.htaccess
Re: build combined spl/uboot/dtb/atf images for Allwinner A64/H5
Hi, this + sysutils/atf-allwinner produced binaries i successfully used to install arm64 for pine64-plus into mmc sd0 w/axen0 on usb, thanks :) the .dtb i used in miniroot was from current dtb-4.12 pkg. -Artturi
Re: ARM Trusted Firmware for RK3399
> Date: Sun, 20 Aug 2017 13:44:57 +1000 > From: Jonathan Gray > > On Sat, Aug 19, 2017 at 05:46:18PM +0200, Mark Kettenis wrote: > > Here is a port for ARM Trusted Firmware 1.4 that builds firmware for > > the Rockchip RK3399. I anticipate that this port will build firmware > > for other ARMv8 Rockchip SoCs as well; there is code for the RK3328 > > and RK3368 in the tree as well. So this installs the firmware as > > rk3399-bl31.elf instead of just bl31.elf. > > > > There is support for other SoCs as well. We currently don't support > > any of those though. There is some qemu code as well that I haven't > > looked into. So maybe this should be a general ATF port? Since there > > already is a port named "atf", I would rename this one to > > "arm-trusted-firmware". > > "arm-trusted-firmware" would match the repository name and seems a > better fit. Maybe expand the DESCR otherwise looks good. Committed that way. > At the moment there is > https://github.com/ARM-software/arm-trusted-firmware/tree/master/plat > arm (juno/vfp) > hisilicon > mediatek > tegra > qemu > rockchip > unipher > zynqmp Right. The HiSilicon and MediaTek SoCs seem to be high-performance SoCs like the Rockchip ones. Xilinx ZyncMP is somewhat interesting because it combines ARMv8 cores with an FPGA. > maybe some of the other vendor forks will get merged one day? > https://github.com/MarvellEmbeddedProcessors/atf-marvell > https://github.com/renesas-rcar/arm-trusted-firmware > > like some others were? > https://github.com/Xilinx/arm-trusted-firmware (zynqmp) > https://github.com/96boards-hikey/arm-trusted-firmware (hisilicon) > https://github.com/uniphier/arm-trusted-firmware > https://github.com/rockchip-linux/arm-trusted-firmware Would be good if the Marvell stuff was merged. But I'm not holding my breath. > Others seem closed? > amd > apm/macom > cavium > freescale/nxp > samsung > qualcomm > broadcom > amlogic > actions > zte > spreadtrum > lg > annapurna labs/amazon > altera/intel For some of the Freescale/NXP the trusted firmware is part of U-Boot. > Then there are third party replacements like atf-allwinner or > https://github.com/linaro-swg/arm-trusted-firmware/tree/rpi3_initial_drop You should still go ahead with the atf-allwinner port. I don't see a reason to use ATF for the rpi3 at this moment.
fix clang build: games/flightgear/base
Hi All.
please find below a diff to fix the clang build for
games/flightgear/base.
Ok? Comments?
Rafael Sadowski
Index: patches/patch-src_FDM_JSBSim_FGFDMExec_cpp
===
RCS file: patches/patch-src_FDM_JSBSim_FGFDMExec_cpp
diff -N patches/patch-src_FDM_JSBSim_FGFDMExec_cpp
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_FDM_JSBSim_FGFDMExec_cpp 20 Aug 2017 21:35:13 -
@@ -0,0 +1,17 @@
+$OpenBSD$
+
+fix clang error:
+ordered comparison between pointer and zero
+
+Index: src/FDM/JSBSim/FGFDMExec.cpp
+--- src/FDM/JSBSim/FGFDMExec.cpp.orig
src/FDM/JSBSim/FGFDMExec.cpp
+@@ -211,7 +211,7 @@ FGFDMExec::~FGFDMExec()
+
+ SetGroundCallback(0);
+
+- if (FDMctr > 0) (*FDMctr)--;
++ if (FDMctr) (*FDMctr)--;
+
+ Debug(1);
+ }
Index: patches/patch-src_FDM_JSBSim_input_output_FGInputSocket_cpp
===
RCS file: patches/patch-src_FDM_JSBSim_input_output_FGInputSocket_cpp
diff -N patches/patch-src_FDM_JSBSim_input_output_FGInputSocket_cpp
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_FDM_JSBSim_input_output_FGInputSocket_cpp 20 Aug 2017
21:35:13 -
@@ -0,0 +1,17 @@
+$OpenBSD$
+
+fix clang error:
+ordered comparison between pointer and zero
+
+Index: src/FDM/JSBSim/input_output/FGInputSocket.cpp
+--- src/FDM/JSBSim/input_output/FGInputSocket.cpp.orig
src/FDM/JSBSim/input_output/FGInputSocket.cpp
+@@ -192,7 +192,7 @@ void FGInputSocket::Read(bool Holding)
+ } else {
+ socket->Reply("Must be in HOLD to search properties\n");
+ }
+-} else if (node > 0) {
++} else if (node) {
+ ostringstream buf;
+ buf << argument << " = " << setw(12) << setprecision(6) <<
node->getDoubleValue() << endl;
+ socket->Reply(buf.str());
Index: patches/patch-src_Network_native_ctrls_cxx
===
RCS file: patches/patch-src_Network_native_ctrls_cxx
diff -N patches/patch-src_Network_native_ctrls_cxx
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_Network_native_ctrls_cxx 20 Aug 2017 21:35:13 -
@@ -0,0 +1,19 @@
+$OpenBSD$
+
+fix clang error:
+ordered comparison between pointer and zero
+
+Index: src/Network/native_ctrls.cxx
+--- src/Network/native_ctrls.cxx.orig
src/Network/native_ctrls.cxx
+@@ -428,8 +428,8 @@ void FGNetCtrls2Props( FGNetCtrls *net, bool honor_fre
+ //node->setDoubleValue( net->brake_right );
+
+ node = fgGetNode( "/controls/switches", true );
+-node->setBoolValue( "master-bat", net->master_bat > 0 );
+-node->setBoolValue( "master-alt", net->master_alt > 0);
++node->setBoolValue( "master-bat", net->master_bat != nullptr );
++node->setBoolValue( "master-alt", net->master_alt != nullptr );
+ node->setBoolValue( "master-avionics", net->master_avionics > 0);
+
+ node = fgGetNode( "/environment", true );
fix clang build: graphics/simgear
Hi All, please find below a diff to fix the clang build for simgear. OK? Comments? Rafael Sadowski Index: patches/patch-simgear_nasal_cppbind_Ghost_hxx === RCS file: patches/patch-simgear_nasal_cppbind_Ghost_hxx diff -N patches/patch-simgear_nasal_cppbind_Ghost_hxx --- /dev/null 1 Jan 1970 00:00:00 - +++ patches/patch-simgear_nasal_cppbind_Ghost_hxx 20 Aug 2017 21:33:26 - @@ -0,0 +1,14 @@ +$OpenBSD$ + +Index: simgear/nasal/cppbind/Ghost.hxx +--- simgear/nasal/cppbind/Ghost.hxx.orig simgear/nasal/cppbind/Ghost.hxx +@@ -36,6 +36,8 @@ + #include + #include + ++#include ++ + #include + + template
fix clang build: emulators/emulationstation
Hi All,
please find below a diff to fix the clang build for emulationstation.
Ok? Comments?
Rafael Sadowski
Index: Makefile
===
RCS file: /cvs/ports/emulators/emulationstation/Makefile,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 Makefile
--- Makefile26 Jul 2017 22:45:19 - 1.4
+++ Makefile20 Aug 2017 21:31:04 -
@@ -24,6 +24,8 @@ MODULES = devel/cmake
COMPILER = gcc
+CXXFLAGS +=-std=c++11 -Wno-inconsistent-missing-override
+
BUILD_DEPENDS =math/eigen3
LIB_DEPENDS = devel/boost \
devel/sdl2 \
Index: patches/patch-es-app_src_components_TextListComponent_h
===
RCS file: patches/patch-es-app_src_components_TextListComponent_h
diff -N patches/patch-es-app_src_components_TextListComponent_h
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-es-app_src_components_TextListComponent_h 20 Aug 2017
21:31:04 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: es-app/src/components/TextListComponent.h
+--- es-app/src/components/TextListComponent.h.orig
es-app/src/components/TextListComponent.h
+@@ -31,7 +31,7 @@ class TextListComponent : public IList::getTransform;
+ using IList::mSize;
+ using IList::mCursor;
+- using IList::Entry;
++ using typename IList::Entry;
+
+ public:
+ using IList::size;
Index: patches/patch-es-core_src_Util_cpp
===
RCS file: patches/patch-es-core_src_Util_cpp
diff -N patches/patch-es-core_src_Util_cpp
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-es-core_src_Util_cpp 20 Aug 2017 21:31:04 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: es-core/src/Util.cpp
+--- es-core/src/Util.cpp.orig
es-core/src/Util.cpp
+@@ -26,7 +26,7 @@ std::string strToUpper(const std::string& str)
+ }
+
+
+-#if _MSC_VER < 1800
++#if defined(_WIN32) && _MSC_VER < 1800
+ float round(float num)
+ {
+ return (float)((int)(num + 0.5f));
Index: patches/patch-es-core_src_Util_h
===
RCS file: patches/patch-es-core_src_Util_h
diff -N patches/patch-es-core_src_Util_h
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-es-core_src_Util_h20 Aug 2017 21:31:04 -
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+Index: es-core/src/Util.h
+--- es-core/src/Util.h.orig
es-core/src/Util.h
+@@ -15,7 +15,9 @@ Eigen::Affine3f roundMatrix(const Eigen::Affine3f& mat
+ Eigen::Vector3f roundVector(const Eigen::Vector3f& vec);
+ Eigen::Vector2f roundVector(const Eigen::Vector2f& vec);
+
++#if defined(_WIN32) && _MSC_VER < 1800
+ float round(float num);
++#endif
+
+ std::string getCanonicalPath(const std::string& str);
+
Index: patches/patch-es-core_src_animations_Animation_h
===
RCS file: patches/patch-es-core_src_animations_Animation_h
diff -N patches/patch-es-core_src_animations_Animation_h
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-es-core_src_animations_Animation_h20 Aug 2017 21:31:04
-
@@ -0,0 +1,13 @@
+$OpenBSD$
+
+Index: es-core/src/animations/Animation.h
+--- es-core/src/animations/Animation.h.orig
es-core/src/animations/Animation.h
+@@ -5,6 +5,7 @@
+ class Animation
+ {
+ public:
++ virtual ~Animation() = default;
+ virtual int getDuration() const = 0;
+ virtual void apply(float t) = 0;
+ };
Index: patches/patch-es-core_src_components_ImageGridComponent_h
===
RCS file: patches/patch-es-core_src_components_ImageGridComponent_h
diff -N patches/patch-es-core_src_components_ImageGridComponent_h
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-es-core_src_components_ImageGridComponent_h 20 Aug 2017
21:31:04 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: es-core/src/components/ImageGridComponent.h
+--- es-core/src/components/ImageGridComponent.h.orig
es-core/src/components/ImageGridComponent.h
+@@ -21,7 +21,7 @@ class ImageGridComponent : public IList::getTransform;
+ using IList::mSize;
+ using IList::mCursor;
+- using IList::Entry;
++ using typename IList::Entry;
+ using IList::mWindow;
+
+ public:
NEW: games/2048-cli
Hello ports@, Please find attached a port for 2048-cli. pkg/DESCR: 2048-cli is a terminal-based version of the popular 2048 web game. Supports animations, colors, stores your high score, and includes an AI. Builds and works well on amd64 and sparc64. -- Kaashif Hymabaccus GPG: 3E810B04 2048-cli.tgz Description: application/tar-gz
Re: [NEW] sysutils/dosfstools
On Tue, 8 Aug 2017, Jeremie Courreges-Anglas wrote:
> On Tue, Aug 01 2017, Donovan Watteau wrote:
> > Hi,
> >
> > $ cat pkg/DESCR
> > dosfstools consists of the programs mkfs.fat, fsck.fat and fatlabel
> > to create, check and label file systems of the FAT family.
> >
> > I've been using this for a few months on loongson and macppc (especially
> > fsck.fat, which a bit more useful than base fsck_mdos(8)), without any
> > particular problem.
> >
> > "make test" is OK as well.
>
> Looks good
>
> Here's an updated tarball with the following tweaks:
> - detect xxd at "make test" time instead of configure time,
Ah yeah, good idea, and simple patch, nice!
> and move editors/vim,-main to TEST_DEPENDS
I think you forgot to actually move it to TEST_DEPENDS (it's now
missing), so I've added it back, in my updated tarball.
> - don't use -Wl,--as-needed in LDFLAGS (is there a good reason?).
mkfs.fat was linked against iconv without using it, so it was a quick
workaround, but on second thought it's not really fixing something for
us. More of a small detail I should report to upstream, instead.
> Instead, append our current LDFLAGS instead of clobbering them
I don't mind this, but I see lots and *lots* of ports just doing
LDFLAGS="-L${LOCALBASE}/lib". So I'm not sure whether it's really
an issue?
> I'd probably move V above DISTNAME,
Looks like most ports do this indeed (including an earlier port of mine),
so ok.
> and EXTRACT_SUFX below MASTER_SITES, but enough nitpicking for today. :)
I see both idioms in the ports tree, and I think I prefer EXTRACT_SUFX
near DISTNAME (because I see the suffix more as a property of the
distfile, rather than a property of the mirror), but I don't mind,
really :)
So here's an updated tarball, mostly adding editors/vim,-main back as
a dependency.
Thank you!
dosfstools-try3.tgz
Description: Binary data
Re: security/password-store GnuPG dependency
> Am 19.08.2017 um 12:16 schrieb Antoine Jacoutot : > > Since the README explicitely states gnupg2, I think we should go for this, > even > if gnupg1 is compatible, to prevent surprises in the future. > OK? Sure. Gpg1 has somewhat lesser dependencies, but lacks default support for the gpg-agent, which significantly increases the usability of pass. Also considering recent periods of subtle incompatibilities between both versions, maybe it is about time to phase out gpg1 anyways.
Re: build combined spl/uboot/dtb/atf images for Allwinner A64/H5
On Sat, Aug 19, 2017 at 11:22:09PM -0400, Patrick Wildt wrote:
> On Sat, Aug 19, 2017 at 08:23:40PM +1000, Jonathan Gray wrote:
> > With the not yet committed atf-allwinner port this builds complete
> > images for Allwinner aarch64 targets.
> >
> > Compile tested only, I have no Allwinner hardware.
> >
> > Details are described in
> > http://git.denx.de/?p=u-boot.git;a=blob_plain;f=board/sunxi/README.sunxi64;hb=HEAD
> >
> > sunxi-spl.bin/u-boot.itb made available for boards with spi flash.
> >
> > Index: Makefile
> > ===
> > RCS file: /cvs/ports/sysutils/u-boot/Makefile,v
> > retrieving revision 1.23
> > diff -u -p -r1.23 Makefile
> > --- Makefile19 Aug 2017 04:40:40 - 1.23
> > +++ Makefile19 Aug 2017 10:13:06 -
> > @@ -7,6 +7,7 @@ FLAVOR?=arm
> >
> > COMMENT= U-Boot firmware
> > VERSION= 2017.09-rc2
> > +REVISION= 0
> > DISTNAME= u-boot-${VERSION}
> > PKGNAME= u-boot-${FLAVOR}-${VERSION:S/-//}
> > FULLPKGNAME= ${PKGNAME}
> > @@ -35,8 +36,10 @@ MAKE_ENV=KBUILD_VERBOSE=1 \
> > PYTHON="${MODPY_BIN}"
> >
> > .if "${FLAVOR}" == "aarch64"
> > -BUILD_DEPENDS+=devel/arm-none-eabi/gcc-linaro,aarch64
> > -MAKE_ENV+= CROSS_COMPILE="aarch64-none-elf-"
> > +BUILD_DEPENDS+=devel/arm-none-eabi/gcc-linaro,aarch64 \
> > + sysutils/atf-allwinner
> > +MAKE_ENV+= CROSS_COMPILE="aarch64-none-elf-" \
> > + BL31="${LOCALBASE}/share/atf-allwinner/bl31.bin"
>
> Cool stuff! But I think this BL31 MAKE_ENV addition needs to be applied
> only for the allwinner boards, because the rockchip will definitely need
> a different ATF binary.
Well, we don't build any aarch64 rockchip targets yet and
it seems the relevant U-Boot bits are still landing upstream.
Here is a diff to only set the environment variable for aarch64
Allwinner targets to be ready for when U-Boot is ready.
Index: Makefile
===
RCS file: /cvs/ports/sysutils/u-boot/Makefile,v
retrieving revision 1.23
diff -u -p -r1.23 Makefile
--- Makefile19 Aug 2017 04:40:40 - 1.23
+++ Makefile20 Aug 2017 08:33:20 -
@@ -7,6 +7,7 @@ FLAVOR?=arm
COMMENT= U-Boot firmware
VERSION= 2017.09-rc2
+REVISION= 0
DISTNAME= u-boot-${VERSION}
PKGNAME= u-boot-${FLAVOR}-${VERSION:S/-//}
FULLPKGNAME= ${PKGNAME}
@@ -35,8 +36,10 @@ MAKE_ENV=KBUILD_VERBOSE=1 \
PYTHON="${MODPY_BIN}"
.if "${FLAVOR}" == "aarch64"
-BUILD_DEPENDS+=devel/arm-none-eabi/gcc-linaro,aarch64
+BUILD_DEPENDS+=devel/arm-none-eabi/gcc-linaro,aarch64 \
+ sysutils/atf-allwinner
MAKE_ENV+= CROSS_COMPILE="aarch64-none-elf-"
+SUNXI_BL31="${LOCALBASE}/share/atf-allwinner/bl31.bin"
.elif "${FLAVOR}" == "arm"
BUILD_DEPENDS+=devel/arm-none-eabi/gcc-linaro
MAKE_ENV+= CROSS_COMPILE="arm-none-eabi-"
@@ -46,13 +49,15 @@ USE_GMAKE= Yes
NO_TEST= Yes
.if "${FLAVOR}" == "aarch64"
-BOARDS=\
+SUNXI64=\
bananapi_m64 \
nanopi_neo2 \
orangepi_pc2 \
orangepi_prime \
orangepi_win \
pine64_plus \
+ sopine_baseboard
+BOARDS=\
rpi_3
.elif "${FLAVOR}" == "arm"
OMAP=\
@@ -60,6 +65,7 @@ OMAP=\
omap4_panda \
am335x_boneblack \
am57xx_evm
+SUNXI64=
SUNXI=\
A10-OLinuXino-Lime \
A10s-OLinuXino-M \
@@ -120,7 +126,9 @@ FILES=\
u-boot-sunxi-with-spl.bin \
u-boot.imx \
u-boot-spl.kwb \
- u-boot-with-spl.bin
+ u-boot-with-spl.bin \
+ u-boot.itb \
+ spl/sunxi-spl.bin
pre-build:
${SUBST_CMD} ${WRKBUILD}/tools/Makefile
@@ -145,10 +153,25 @@ do-build:
cat u-boot-dtb.bin >> u-boot-with-spl.bin
.endif
.endfor
+.for BOARD in ${SUNXI64}
+ cd ${WRKSRC} && \
+ mkdir -p build/${BOARD} && \
+ ${SETENV} ${MAKE_ENV} BL31=${SUNXI_BL31} ${MAKE_PROGRAM} \
+ ${MAKE_FLAGS} O="build/${BOARD}" \
+ -f ${MAKE_FILE} "${BOARD}"_defconfig && \
+ ${SETENV} ${MAKE_ENV} BL31=${SUNXI_BL31} ${MAKE_PROGRAM} \
+ ${MAKE_FLAGS} O="build/${BOARD}" \
+ -f ${MAKE_FILE} ${ALL_TARGET}
+ if [[ -f ${WRKSRC}/build/${BOARD}/spl/sunxi-spl.bin && \
+ -f ${WRKSRC}/build/${BOARD}/u-boot.itb ]]; then \
+ cd ${WRKSRC}/build/${BOARD} && \
+ cat spl/sunxi-spl.bin u-boot.itb >
u-boot-sunxi-with-spl.bin ; \
+ fi
+.endfor
do-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/u-boot
-.for BOARD in ${BOARDS}
+.for BOARD in ${BOARDS} ${SUNXI64}
${INSTALL_DATA_DIR} ${PREFIX}/share/u-boot/${BOARD}
-cd ${WRKSRC}/build/${BOARD} && \
cp ${FILES} ${PREFIX}/share/u-boot/${BOARD}/
Index: pkg/PFRAG.aarch64
===
RCS file: /cvs/ports/sysutils
Re: udpate: sysclean 2.4
On Sun, Aug 20, 2017 at 10:16:01AM +0200, Sebastien Marie wrote:
> Hi,
>
> Here an update for sysclean 2.3 -> 2.4.
>
> ChangeLog:
> - install the script inside sbin/ instead of bin/ as sysclean is root
> only
> - check the man page using mandoc -Tlint -Wstyle
> - add accounting support (if enabled via rc.conf.local)
Committed, thanks.
>
> Thanks.
> --
> Sebastien Marie
>
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/sysutils/sysclean/Makefile,v
> retrieving revision 1.13
> diff -u -p -r1.13 Makefile
> --- Makefile 21 Jun 2017 15:16:31 - 1.13
> +++ Makefile 20 Aug 2017 08:11:08 -
> @@ -4,7 +4,7 @@ COMMENT = list obsolete files between Op
>
> GH_ACCOUNT = semarie
> GH_PROJECT = sysclean
> -GH_TAGNAME = 2.3
> +GH_TAGNAME = 2.4
>
> CATEGORIES = sysutils
> HOMEPAGE = https://github.com/semarie/sysclean/
> @@ -14,7 +14,7 @@ MAINTAINER =Sebastien Marie # ISC
> PERMIT_PACKAGE_CDROM = Yes
>
> -MAKE_ENV = BINDIR=${LOCALBASE}/bin \
> +MAKE_ENV = BINDIR=${LOCALBASE}/sbin \
> MANDIR=${LOCALBASE}/man/man
>
> NO_BUILD = Yes
> Index: distinfo
> ===
> RCS file: /cvs/ports/sysutils/sysclean/distinfo,v
> retrieving revision 1.12
> diff -u -p -r1.12 distinfo
> --- distinfo 21 Jun 2017 15:16:31 - 1.12
> +++ distinfo 20 Aug 2017 08:11:08 -
> @@ -1,2 +1,2 @@
> -SHA256 (sysclean-2.3.tar.gz) = X5Q07BmhkOjwt4HRHXrBvvNGRAM7Nl+ogjCFa9dqBVc=
> -SIZE (sysclean-2.3.tar.gz) = 5798
> +SHA256 (sysclean-2.4.tar.gz) = uce1MYfem7eo4mjDvnoZH+nADdcTPAY4igJzNn9cfR8=
> +SIZE (sysclean-2.4.tar.gz) = 5837
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/sysutils/sysclean/pkg/PLIST,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 PLIST
> --- pkg/PLIST 5 Mar 2016 15:33:19 - 1.1.1.1
> +++ pkg/PLIST 20 Aug 2017 08:11:08 -
> @@ -1,5 +1,5 @@
> @comment $OpenBSD: PLIST,v 1.1.1.1 2016/03/05 15:33:19 semarie Exp $
> -bin/sysclean
> @man man/man8/sysclean.8
> +sbin/sysclean
> share/examples/sysclean/
> share/examples/sysclean/sysclean.ignore
>
--
Antoine
udpate: sysclean 2.4
Hi, Here an update for sysclean 2.3 -> 2.4. ChangeLog: - install the script inside sbin/ instead of bin/ as sysclean is root only - check the man page using mandoc -Tlint -Wstyle - add accounting support (if enabled via rc.conf.local) Thanks. -- Sebastien Marie Index: Makefile === RCS file: /cvs/ports/sysutils/sysclean/Makefile,v retrieving revision 1.13 diff -u -p -r1.13 Makefile --- Makefile21 Jun 2017 15:16:31 - 1.13 +++ Makefile20 Aug 2017 08:11:08 - @@ -4,7 +4,7 @@ COMMENT = list obsolete files between Op GH_ACCOUNT = semarie GH_PROJECT = sysclean -GH_TAGNAME = 2.3 +GH_TAGNAME = 2.4 CATEGORIES = sysutils HOMEPAGE = https://github.com/semarie/sysclean/ @@ -14,7 +14,7 @@ MAINTAINER = Sebastien Marie
