Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

For upstream #150

Merged
merged 7 commits into from
Jun 3, 2016
Merged

For upstream #150

merged 7 commits into from
Jun 3, 2016

Conversation

plieven
Copy link
Contributor

@plieven plieven commented Jun 2, 2016

No description provided.

plieven and others added 6 commits May 31, 2016 08:34
@plieven
pagecache: avoid time() syscall if the cache has no ttl
36d687c 
Signed-off-by: Peter Lieven <pl@kamp.de>
@plieven
libnfs-sync: make send_nfsd_probes portable
5a660d5 
Signed-off-by: Peter Lieven <pl@kamp.de>
@plieven
pagecache: allow readahead and pagecache options to coexist
14492d5 
before this setting readahead would always modify the pagecache,
but it might be desireable to have a greater pagecache and only
a reasonable small readahead.

Signed-off-by: Peter Lieven <pl@kamp.de>
@plieven
libnfs: avoid a bounce buffer in pread if possible
21c4662 
there are cases where we do not need the bounce buffer. So avoid
the overhead of malloc, memcpy and free.

Signed-off-by: Peter Lieven <pl@kamp.de>
@plieven
pdu: drop the rpc->encodebuf
9cb4949 
the only call thar really needs a big encodebuf is WRITE. So give each
PDU its private encodebuf. This avoids the need to memcpy the data from
the static rpc->encodebuf to the pdu->outdata.data.

Signed-off-by: Peter Lieven <pl@kamp.de>
@sahlberg @plieven
gcc 5.3 does not allow casting a char * to any longer, so cast via vo…
f9455e5 
…id *

Signed-off-by: Ronnie Sahlberg <ronniesahlberg@gmail.com>
This was referenced Jun 2, 2016
Closed
Merged
sahlberg
sahlberg reviewed Jun 2, 2016
View reviewed changes
lib/libnfs-zdr.c
@@ -54,6 +54,14 @@ struct zdr_mem {

struct opaque_auth _null_auth;

inline uint32_t libnfs_buf2hl(char *buf) {
return ntohl(*(uint32_t *)(void *)buf);
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could probably change the buf argument to b void *buf and avoid the explicit cast.
But doesn't matter.

I can merge as is once Milhouse verifies it works (or once I set up a rpi emulator)

@plieven
Copy link
Contributor Author

plieven commented Jun 2, 2016

@sahlberg good comment, changed it.

@MilhouseVH I fail to setup the libreelec toolchain. can you advise:

root@libreleec-toolchain:/usr/src/projects# ./packages/make-libnfs.sh
Loading profile: pi2 [15:12:27](./supermk.sh libnfs.git ./tools/mkpkg_libnfs network/libnfs/package.mk)
ERROR: Failure querying /usr/src/projects/LibreELEC.tv for "CCACHE_DIR", check PROJECT/ARCH [RPi2/arm] settings
ERROR: Failure querying /usr/src/projects/LibreELEC.tv for "DISTRO", check PROJECT/ARCH [RPi2/arm] settings
Failure obtaining DISTRO

@MilhouseVH
Copy link
Contributor

MilhouseVH commented Jun 2, 2016 •
edited
Loading

@plieven - I think you've missed out this step:

mv build.conf.sample build.conf

Alternatively, try without building as root - I wouldn't advise building as root. You should be able to build with a regular user account,.

I'm able to confirm that with #150, libnfs now builds natively on the RPi2 - many thanks!

@MilhouseVH
Copy link
Contributor

Weird, cross-compiling for ARMv7 (RPi2) on Ubuntu (gcc 5.3.0) I'm getting this build failure: http://sprunge.us/QQAV

@MilhouseVH
Copy link
Contributor

Apparently it may require --std=gnu89 in CFLAGS (as one solution) but maybe there's a better way which doesn't require specific flags? gcc 5.x has changed default std from 89 to gnull.

@MilhouseVH
Copy link
Contributor

LE x86 build has also failed (same reason as RPi).

About to head out for the evening, if you have any changes I can test them tomorrow (maybe overnight).

@plieven
Copy link
Contributor Author

plieven commented Jun 2, 2016

please try to build without 5d0f0b7

@MilhouseVH
Copy link
Contributor

please try to build without 5d0f0b7

Yes, that cross-compiles OK with gcc-5.3.0, and Kodi also runs fine (on both RPi2 and x86).

@plieven
pagecache: define hash constant as UL
10546da 
Signed-off-by: Peter Lieven <pl@kamp.de>
@plieven
Copy link
Contributor Author

plieven commented Jun 3, 2016

I removed that patch from the pull request it was only cosmetic. @sahlberg I think you can go ahead.

@plieven
Copy link
Contributor Author

plieven commented Jun 3, 2016

@MilhouseVH regarding the cross compiler tool chain. I copied the sample conf and nevertheless get the error. can you please verify the commands. Thanks.

@sahlberg sahlberg merged commit cdd1643 into sahlberg:master Jun 3, 2016
@MilhouseVH
Copy link
Contributor

MilhouseVH commented Jun 3, 2016 •
edited
Loading

@plieven I've just tested the instructions on a fresh Ubuntu 16.04 VM (VirtualBox) and the instructions are working as expected (the only issue being interdiff which isn't available in 16.04 - fortunately this isn't an issue as you don't need it to build libnfs - and I also needed to install git, as it was a fresh Ubuntu).

So really not sure what the problem is here. Although, when you posted the error, you seemed to be running as root in /usr/src which could be part of the problem... I'd suggest executing the instructions as a normal user in the users /home directory (ie. $HOME) - that's where I ran the instructions without any issue.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@plieven @MilhouseVH @sahlberg