Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: timvideos/HDMI2USB-litex-firmware
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 8daff413a24c
Choose a base ref
...
head repository: timvideos/HDMI2USB-litex-firmware
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: bb247f772fca
Choose a head ref
  • 5 commits
  • 1 file changed
  • 2 contributors

Commits on Feb 7, 2018

  1. tftpd: Fix in.tftp alternate port syntax

    @ewenmcneill
    ewenmcneill committed Feb 7, 2018

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    bb9c4d9 View commit details

  2. tftpd: in.tftpd always needs to run with sudo

    @ewenmcneill
    ewenmcneill committed Feb 7, 2018
    Copy the full SHA
    3f438c1 View commit details

  3. tftpd: s/in.tfptd/in.tftpd/ 

    Fixed typo in in.tftpd name (thanks to @stffrdhrn and @mithro for spotting
the typo)
    @ewenmcneill
    ewenmcneill committed Feb 7, 2018
    Copy the full SHA
    abc1cde View commit details

  4. Merge pull request #21 from ewen-naos-nz/in-tftpd-fix 

    tftpd: Fix in.tftpd alternate port syntax
    @mithro
    mithro authored Feb 7, 2018
    Copy the full SHA
    786ee03 View commit details

Commits on Feb 8, 2018

  1. Merge branch 'litex-buildenv/master'

    @mithro
    mithro committed Feb 8, 2018
    Copy the full SHA
    bb247f7 View commit details
Showing with 15 additions and 4 deletions.
  1. +15 −4 Makefile
19 changes: 15 additions & 4 deletions Makefile
View file
Original file line number Diff line number Diff line change
@@ -342,7 +342,12 @@ ifeq ($(ATFTPD),)
ATFTPD:=/usr/sbin/atftpd
endif

IN_TFTPD:=$(shell which in.tfptd)
# Requires HPA in.tftpd not traditional BSD in.tftpd
# Unfortunately in.tftpd seems to require root always
# even if run as current user, otherwise it reports
# "cannot set groups for user $USER"
#
IN_TFTPD:=$(shell which in.tftpd)
ifeq ($(IN_TFTPD),)
IN_TFTPD:=/usr/sbin/in.tftpd
endif
@@ -357,7 +362,11 @@ tftpd_stop:
sudo true; \
sudo killall atftpd || sudo killall in.tftpd || true; \
else \
killall atftpd || killall in.tftpd || true; \
killall atftpd || \
if ps axuwww | grep -v grep | \
grep "[i]n.tftpd" >/dev/null 2>&1; then \
sudo killall in.tftpd; \
fi || true; \
fi

tftpd_start:
@@ -376,9 +385,11 @@ tftpd_start:
elif [ -x "$(IN_TFTPD)" ]; then \
echo "Starting in.tftpd"; \
if [ $(TFTP_SERVER_PORT) -lt 1024 ]; then \
sudo "$(IN_TFTPD)" --verbose --listen --address $(TFTP_IPRANGE).100 --port-range $(TFTP_SERVER_PORT):$(TFTP_SERVER_PORT) --user $(shell whoami) -s $(TFTPD_DIR) & \
sudo "$(IN_TFTPD)" --verbose --listen --address $(TFTP_IPRANGE).100:$(TFTP_SERVER_PORT) --user $(shell whoami) -s $(TFTPD_DIR) & \
else \
"$(IN_TFTPD)" --verbose --listen --address $(TFTP_IPRANGE).100 --port-range $(TFTP_SERVER_PORT):$(TFTP_SERVER_PORT) --user $(shell whoami) -s $(TFTPD_DIR) & \
echo "Root required to run in.tftpd, will use sudo"; \
sudo true; \
sudo "$(IN_TFTPD)" --verbose --listen --address $(TFTP_IPRANGE).100:$(TFTP_SERVER_PORT) --user $(shell whoami) -s $(TFTPD_DIR) & \
fi \
else \
echo "Cannot find an appropriate tftpd binary to launch the server."; \