Compare commits
2 Commits
mob/debug
...
fix-gl-ar7
Author | SHA1 | Date | |
---|---|---|---|
3f1f7c08d4 | |||
9621ac51e9 |
@@ -98,11 +98,6 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
checkConfigurationPhase = ''
|
checkConfigurationPhase = ''
|
||||||
echo Checking required config items:
|
echo Checking required config items:
|
||||||
echo ======================================================
|
|
||||||
echo ======================================================
|
|
||||||
echo ------------------------------------------------------
|
|
||||||
echo $modulesupport
|
|
||||||
echo ------------------------------------------------------
|
|
||||||
if comm -2 -3 <(grep 'CONFIG' ${kconfigFile} |sort) <(grep 'CONFIG' .config|sort) |grep '.' ; then
|
if comm -2 -3 <(grep 'CONFIG' ${kconfigFile} |sort) <(grep 'CONFIG' .config|sort) |grep '.' ; then
|
||||||
echo -e "^^^ Some configuration lost :-(\nPerhaps you have mutually incompatible settings, or have disabled options on which these depend.\n"
|
echo -e "^^^ Some configuration lost :-(\nPerhaps you have mutually incompatible settings, or have disabled options on which these depend.\n"
|
||||||
exit 0
|
exit 0
|
||||||
@@ -124,9 +119,5 @@ stdenv.mkDerivation rec {
|
|||||||
make modules
|
make modules
|
||||||
cp -a . $modulesupport
|
cp -a . $modulesupport
|
||||||
cp .config $config
|
cp .config $config
|
||||||
echo ------------------------------------------------------
|
|
||||||
cat .config
|
|
||||||
echo $config
|
|
||||||
echo ------------------------------------------------------
|
|
||||||
'';
|
'';
|
||||||
}
|
}
|
||||||
|
@@ -24,11 +24,6 @@ stdenv.mkDerivation {
|
|||||||
phases = [ "buildPhase" ];
|
phases = [ "buildPhase" ];
|
||||||
nativeBuildInputs = [ dtc ];
|
nativeBuildInputs = [ dtc ];
|
||||||
buildPhase = ''
|
buildPhase = ''
|
||||||
echo ==================================================
|
|
||||||
echo ${dtcSearchFlags}
|
|
||||||
echo ==
|
|
||||||
echo ${cppDtSearchFlags}
|
|
||||||
echo ==================================================
|
|
||||||
${stdenv.cc.targetPrefix}cpp -nostdinc -x assembler-with-cpp ${cppDtSearchFlags} -undef -D__DTS__ -o dtb.tmp ${combined}
|
${stdenv.cc.targetPrefix}cpp -nostdinc -x assembler-with-cpp ${cppDtSearchFlags} -undef -D__DTS__ -o dtb.tmp ${combined}
|
||||||
dtc ${dtcSearchFlags} -I dts -O dtb -o $out dtb.tmp
|
dtc ${dtcSearchFlags} -I dts -O dtb -o $out dtb.tmp
|
||||||
# dtc -I dtb -O dts $out
|
# dtc -I dtb -O dts $out
|
||||||
|
@@ -1,16 +1,15 @@
|
|||||||
{
|
{
|
||||||
lib,
|
lib,
|
||||||
stdenv,
|
stdenv,
|
||||||
fetchFromGitHub,
|
fetchgit,
|
||||||
ppp,
|
ppp,
|
||||||
}:
|
}:
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "rp-pppoe";
|
pname = "rp-pppoe";
|
||||||
version = "4.0-plus";
|
version = "4.0-plus";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchgit {
|
||||||
owner = "dfskoll";
|
url = "https://codeberg.org/dskoll/rp-pppoe";
|
||||||
repo = "rp-pppoe";
|
|
||||||
rev = "3c0f6c02279881d723743023634b19b77a7d9f82";
|
rev = "3c0f6c02279881d723743023634b19b77a7d9f82";
|
||||||
hash = "sha256-RUUbP5j2I2DERQ7RE8xj4Xt1FoQOanMRoMiB1H6Wrdw=";
|
hash = "sha256-RUUbP5j2I2DERQ7RE8xj4Xt1FoQOanMRoMiB1H6Wrdw=";
|
||||||
# rev = "7cfd8c0405d14cf1c8d799d41d8207fd707979c1";
|
# rev = "7cfd8c0405d14cf1c8d799d41d8207fd707979c1";
|
||||||
|
Reference in New Issue
Block a user