История изменений
Исправление open-source, (текущая версия) :
Сделал всё как нужно, вот такой новый план:
sudo apt-get install build-essential libpci-dev libusb-dev libusb-1.0-0-dev libftdi-dev gnat flex bison libncurses5-dev wget zlib1g-dev unzip xxd libpkgconf3 pkg-config pkgconf pkgconf-bin libssl-dev git aptitude
git clone https://review.coreboot.org/coreboot.git
cd ./coreboot/
git submodule update --init --checkout
git reset --hard 69ffebf5ccf123bc0b3fb28b485985af0597761d
nano ./restore_agesa.sh
chmod +x ./restore_agesa.sh
./restore_agesa.sh
sudo aptitude purge gnat
make crossgcc-i386 BUILD_LANGUAGES=c
nano ./csb_patcher.sh
chmod +x ./csb_patcher.sh
./csb_patcher.sh
make menuconfig
make
Ошибки во время исполнения скрипта ./restore_agesa.sh:
CONFLICT (modify/delete): Documentation/releases/coreboot-4.22-relnotes.md deleted in HEAD and modified in parent of f3ae1a1209 (crossgcc: Upgrade MPFR from 4.2.0 to 4.2.1). Version parent of f3ae1a1209 (crossgcc: Upgrade MPFR from 4.2.0 to 4.2.1) of Documentation/releases/coreboot-4.22-relnotes.md left in tree.
Auto-merging util/crossgcc/buildgcc
CONFLICT (content): Merge conflict in util/crossgcc/buildgcc
error: could not revert f3ae1a1209... crossgcc: Upgrade MPFR from 4.2.0 to 4.2.1
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git revert --continue".
hint: You can instead skip this commit with "git revert --skip".
hint: To abort and get back to the state before "git revert",
hint: run "git revert --abort".
Исправление open-source, :
Сделал всё как нужно, вот такой новый план:
sudo apt-get install build-essential libpci-dev libusb-dev libusb-1.0-0-dev libftdi-dev gnat flex bison libncurses5-dev wget zlib1g-dev unzip xxd libpkgconf3 pkg-config pkgconf pkgconf-bin libssl-dev git aptitude
git clone https://review.coreboot.org/coreboot.git
cd ./coreboot/
git submodule update --init --checkout
git reset --hard 69ffebf5ccf123bc0b3fb28b485985af0597761d
nano ./restore_agesa.sh
chmod +x ./restore_agesa.sh
./restore_agesa.sh
sudo aptitude purge gnat
make crossgcc-i386 BUILD_LANGUAGES=c
nano ./csb_patcher.sh
chmod +x ./csb_patcher.sh
./csb_patcher.sh
make menuconfig
make
Ошибки во время исполнения скрипта ./restore_agesa.sh:
CONFLICT (modify/delete): Documentation/releases/coreboot-4.22-relnotes.md deleted in HEAD and modified in parent of f3ae1a1209 (crossgcc: Upgrade MPFR from 4.2.0 to 4.2.1). Version parent of f3ae1a1209 (crossgcc: Upgrade MPFR from 4.2.0 t o 4.2.1) of Documentation/releases/coreboot-4.22-relnotes.md left in tree.
Auto-merging util/crossgcc/buildgcc
CONFLICT (content): Merge conflict in util/crossgcc/buildgcc
error: could not revert f3ae1a1209... crossgcc: Upgrade MPFR from 4.2.0 to 4.2.1
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git revert --continue".
hint: You can instead skip this commit with "git revert --skip".
hint: To abort and get back to the state before "git revert",
hint: run "git revert --abort".
Исходная версия open-source, :
Сделал всё как нужно, вот такой новый план:
sudo apt-get install build-essential libpci-dev libusb-dev libusb-1.0-0-dev libftdi-dev gnat flex bison libncurses5-dev wget zlib1g-dev unzip xxd libpkgconf3 pkg-config pkgconf pkgconf-bin libssl-dev git aptitude
git clone https://review.coreboot.org/coreboot.git
cd ./coreboot/
git submodule update --init --checkout
git reset --hard 69ffebf5ccf123bc0b3fb28b485985af0597761d
nano ./restore_agesa.sh
chmod +x ./restore_agesa.sh
./restore_agesa.sh
sudo aptitude purge gnat
make crossgcc-i386 BUILD_LANGUAGES=c
nano ./csb_patcher.sh
chmod +x ./csb_patcher.sh
./csb_patcher.sh
make menuconfig
make
Ошибки во время исполнения скрипта ./restore_agesa.sh:
CONFLICT (modify/delete): Documentation/releases/coreboot-4.22-relnotes.md deleted in HEAD and modified in parent of f3ae1a1209 (crossgcc: Upgrade MPFR from 4.2 .0 to 4.2.1). Version parent of f3ae1a1209 (crossgcc: Upgrade MPFR from 4.2.0 t o 4.2.1) of Documentation/releases/coreboot-4.22-relnotes.md left in tree.
Auto-merging util/crossgcc/buildgcc
CONFLICT (content): Merge conflict in util/crossgcc/buildgcc
error: could not revert f3ae1a1209... crossgcc: Upgrade MPFR from 4.2.0 to 4.2.1
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git revert --continue".
hint: You can instead skip this commit with "git revert --skip".
hint: To abort and get back to the state before "git revert",
hint: run "git revert --abort".