Restored reverted patch to make for Ubuntu 18.04, Debian 10 and Raspbian-only
Restored reverted patch to make for Ubuntu 18.04, Debian 10 and Raspbian-only

Signed-off-by: Matt Ray <7e52177cddfb62fe8054f02ca5c9d9dd1cd61754@gmail.com>

higanworks/omnibus-software,aerobase/omnibus-software,aerobase/omnibus-software,aerobase/omnibus-software,aerobase/omnibus-software,aerobase/omnibus-software,chef/omnibus-software,mattray/omnibus-software,chef/omnibus-software,chef/omnibus-software,chef/omnibus-software,mattray/omnibus-software,higanworks/omnibus-software,mattray/omnibus-software,chef/omnibus-software,higanworks/omnibus-software,mattray/omnibus-software,higanworks/omnibus-software,chef/omnibus-software,mattray/omnibus-software