Skip to content

Commit

Permalink
Revert "Upgrade binutils, zlib and grub"
Browse files Browse the repository at this point in the history
This reverts commit fcd268b.

There is a problem with x86_64 that I haven't root caused yet.
Leeping zlib in 1.3.1.
  • Loading branch information
flavioc committed Feb 12, 2024
1 parent ab9419a commit 4c75de6
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 28 deletions.
26 changes: 2 additions & 24 deletions compile.sh
Original file line number Diff line number Diff line change
Expand Up @@ -269,24 +269,8 @@ install_util_linux() {
}

install_grub() {
rm -f $SOURCE/$GRUB_SRC/grub-core/extra_deps.lst &&
echo depends bli part_gpt > $SOURCE/$GRUB_SRC/grub-core/extra_deps.lst &&
rm -rf $GRUB_SRC.obj &&
mkdir -p $GRUB_SRC.obj &&
pushd $GRUB_SRC.obj &&
local existing_cc=$CC
local existing_cxx=$CXX
local existing_ar=$AR
local existing_ranlib=$RANLIB
local existing_ld=$LD
local existing_strip=$STRIP
unset CC
unset AR
unset RANLIB
unset LD
unset STRIP
unset CXX
RANLIB=ranlib CXX=g++ AR=ar STRIP=strip TARGET_STRIP=$existing_strip TARGET_CC=$existing_cc CPP="gcc -E" \
cd $GRUB_SRC.obj &&
$SOURCE/$GRUB_SRC/configure --prefix="$SYS_ROOT" \
--build=${HOST} \
--host=${TARGET} \
Expand All @@ -296,13 +280,7 @@ install_grub() {
--with-bootdir=$SYS_ROOT/boot &&
make -j$PROCS &&
make -j$PROCS install &&
export CC=$existing_cc
export CXX=$existing_cxx
export AR=$existing_ar
export RANLIB=$existing_ranlib
export LD=$existing_ld
export STRIP=$existing_strip
popd
cd ..
}

install_libxcrypt () {
Expand Down
3 changes: 1 addition & 2 deletions download-funcs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,7 @@ download_from_git () {
local git_result=$?
popd &&
return $git_result
fi) &&
(if [ -n "$CACHE_GIT" ]; then
elif [ -n "$CACHE_GIT" ]; then
mkdir -p $DOWNLOAD_CACHE_DIRECTORY &&
pushd $DOWNLOAD_CACHE_DIRECTORY &&
(if [ -d $dir ]; then
Expand Down
4 changes: 2 additions & 2 deletions package-versions.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Package versions.
BINUTILS_VERSION=2.42
BINUTILS_VERSION=2.41
GCC_VERSION=13.2.0
FLEX_VERSION=2.6.4
ZLIB_VERSION=1.3.1
Expand All @@ -13,7 +13,7 @@ LIBUUID_VERSION=1.0.3
UTIL_LINUX_MAJOR_VERSION=2.39
# 2.39.2 fails because libmount/src/hooks.c is being compiled without proper support.
UTIL_LINUX_VERSION=2.39
GRUB_VERSION=2.12
GRUB_VERSION=2.06
SHADOW_VERSION=4.14.2
SED_VERSION=4.9
GMP_VERSION=6.3.0
Expand Down

0 comments on commit 4c75de6

Please sign in to comment.