From 4111d41ef221ef2a111feb4ac227199bc2da4441 Mon Sep 17 00:00:00 2001 From: Ohio2 Date: Mon, 12 Jul 2021 02:21:18 +0200 Subject: [PATCH 01/11] grub-defconfig removed in favour of making a template config by configmake --- grub-configmake/package | 6 +++ .../payload/usr/bin/grub-configmake | 40 +++++++++++++++++++ 2 files changed, 46 insertions(+) create mode 100755 grub-configmake/package create mode 100644 grub-configmake/payload/usr/bin/grub-configmake diff --git a/grub-configmake/package b/grub-configmake/package new file mode 100755 index 0000000..d94134b --- /dev/null +++ b/grub-configmake/package @@ -0,0 +1,6 @@ +#Made By Ohio2 +pkg_config_deploy=true +pkg_config_ver="0.2" +pkg_config_name="grub-configmake" +pkg_config_makedepends="" +pkg_config_depends="" diff --git a/grub-configmake/payload/usr/bin/grub-configmake b/grub-configmake/payload/usr/bin/grub-configmake new file mode 100644 index 0000000..c49cf9c --- /dev/null +++ b/grub-configmake/payload/usr/bin/grub-configmake @@ -0,0 +1,40 @@ +#!/bin/sh +echo -ne 'Running grub-configmake by ohio2'\\r +echo -ne '.'\\r +wait 0.5 +echo -ne '.'\\r +wait 0.5 +echo -ne '.'\\r +echo +echo +echo +echo +echo +echo +echo +echo +echo +echo +echo +read -p "What drive do you want to set root to? (Only otherwise it won't work.)" root +cat > /boot/grub/grub.cfg << "EOF" +set default=0 +set timeout=5 + +insmod ext2 +set root=(hd0,${root}) + +menuentry "Alnux+Busybox/Linux" { + linux /boot/bzImage root=/dev/sda${root} rw +} +EOF +echo +echo +echo +echo +echo +echo +echo +echo +echo "grub-configmake by ohio2 completed it's job" +exit 0 From 1ca3b85479882948c19b93c9a2d1f2b1f4ec10ce Mon Sep 17 00:00:00 2001 From: Ohio2 Date: Mon, 12 Jul 2021 02:34:17 +0200 Subject: [PATCH 02/11] grub-defconfig removed in favour of making a template config by configmake --- grub-defconfig/package | 5 ----- grub-defconfig/payload/boot/grub/grub.cfg | 8 -------- 2 files changed, 13 deletions(-) delete mode 100755 grub-defconfig/package delete mode 100644 grub-defconfig/payload/boot/grub/grub.cfg diff --git a/grub-defconfig/package b/grub-defconfig/package deleted file mode 100755 index 6dae383..0000000 --- a/grub-defconfig/package +++ /dev/null @@ -1,5 +0,0 @@ -pkg_config_deploy=true -pkg_config_ver="0.2" -pkg_config_name="grub-defconfig" -pkg_config_makedepends="" -pkg_config_depends="" \ No newline at end of file diff --git a/grub-defconfig/payload/boot/grub/grub.cfg b/grub-defconfig/payload/boot/grub/grub.cfg deleted file mode 100644 index 3cc5cf0..0000000 --- a/grub-defconfig/payload/boot/grub/grub.cfg +++ /dev/null @@ -1,8 +0,0 @@ -set timeout=15 -set default=0 - -menuentry "Alnux" { - # you will probably want to change the root below... - linux /boot/bzImage noapic root=/dev/sda1 init=/usr/bin/hummingbird - boot -} From 7118dd99e6937894e9cc4fcddd24e2e96d036a96 Mon Sep 17 00:00:00 2001 From: Ohio2 Date: Mon, 12 Jul 2021 05:18:53 +0200 Subject: [PATCH 03/11] modify grub-configmake and add a lot of option --- grub-configmake/payload/usr/bin/grub-configmake | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/grub-configmake/payload/usr/bin/grub-configmake b/grub-configmake/payload/usr/bin/grub-configmake index c49cf9c..68e8f89 100644 --- a/grub-configmake/payload/usr/bin/grub-configmake +++ b/grub-configmake/payload/usr/bin/grub-configmake @@ -16,8 +16,11 @@ echo echo echo echo -read -p "What drive do you want to set root to? (Only otherwise it won't work.)" root -cat > /boot/grub/grub.cfg << "EOF" +read -p "What is the install root you are using?" install_root +mkdir -p ${install_root}/boot/grub +read -p "What drive do you want to set root to? (Only otherwise it won't work.)" grub_root +read -p "Init binary (full path only)" init_path +cat > ${install_root}/boot/grub/grub.cfg << "EOF" set default=0 set timeout=5 @@ -25,7 +28,7 @@ insmod ext2 set root=(hd0,${root}) menuentry "Alnux+Busybox/Linux" { - linux /boot/bzImage root=/dev/sda${root} rw + linux /boot/bzImage root=/dev/sda${grub_root} rw init=${init path} rw } EOF echo From 0dce2b112ebf4627294b4b992ac49b2a13f3383b Mon Sep 17 00:00:00 2001 From: Ohio2 Date: Mon, 12 Jul 2021 18:45:18 +0200 Subject: [PATCH 04/11] modified grub-cfgmake --- .../payload/usr/bin/grub-configmake | 27 +++---------------- 1 file changed, 4 insertions(+), 23 deletions(-) diff --git a/grub-configmake/payload/usr/bin/grub-configmake b/grub-configmake/payload/usr/bin/grub-configmake index 68e8f89..86bbfc4 100644 --- a/grub-configmake/payload/usr/bin/grub-configmake +++ b/grub-configmake/payload/usr/bin/grub-configmake @@ -1,26 +1,15 @@ #!/bin/sh -echo -ne 'Running grub-configmake by ohio2'\\r +echo -ne 'Running grub-configmake'\\r echo -ne '.'\\r wait 0.5 echo -ne '.'\\r wait 0.5 echo -ne '.'\\r -echo -echo -echo -echo -echo -echo -echo -echo -echo -echo -echo read -p "What is the install root you are using?" install_root -mkdir -p ${install_root}/boot/grub +mkdir -p ${install_root}/boot/grub | echo "You probably didn't make /boot" && exit 2 read -p "What drive do you want to set root to? (Only otherwise it won't work.)" grub_root read -p "Init binary (full path only)" init_path -cat > ${install_root}/boot/grub/grub.cfg << "EOF" +cat > ${install_root}/boot/grub/grub.cfg << "EOF" set default=0 set timeout=5 @@ -31,13 +20,5 @@ menuentry "Alnux+Busybox/Linux" { linux /boot/bzImage root=/dev/sda${grub_root} rw init=${init path} rw } EOF -echo -echo -echo -echo -echo -echo -echo -echo -echo "grub-configmake by ohio2 completed it's job" +echo "grub-configmake made it's job" exit 0 From 0284540455705f404bac55ab73fbb9f6b9904b56 Mon Sep 17 00:00:00 2001 From: Ohio2 Date: Mon, 12 Jul 2021 20:25:49 +0200 Subject: [PATCH 05/11] changed speed of grub-cfgmake :trol: --- grub-configmake/payload/usr/bin/grub-configmake | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/grub-configmake/payload/usr/bin/grub-configmake b/grub-configmake/payload/usr/bin/grub-configmake index 86bbfc4..17d4698 100644 --- a/grub-configmake/payload/usr/bin/grub-configmake +++ b/grub-configmake/payload/usr/bin/grub-configmake @@ -1,10 +1,5 @@ #!/bin/sh -echo -ne 'Running grub-configmake'\\r -echo -ne '.'\\r -wait 0.5 -echo -ne '.'\\r -wait 0.5 -echo -ne '.'\\r +echo -ne 'Running grub-configmake' read -p "What is the install root you are using?" install_root mkdir -p ${install_root}/boot/grub | echo "You probably didn't make /boot" && exit 2 read -p "What drive do you want to set root to? (Only otherwise it won't work.)" grub_root From 6f9e73714da7ef0095e1bd135d267618a3ee942d Mon Sep 17 00:00:00 2001 From: Ohio2 Date: Mon, 12 Jul 2021 20:41:56 +0200 Subject: [PATCH 06/11] Grub-configmake updated with a config it saves to --- .../payload/usr/bin/grub-configmake | 27 ++++++++++++++----- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/grub-configmake/payload/usr/bin/grub-configmake b/grub-configmake/payload/usr/bin/grub-configmake index 17d4698..1e01b29 100644 --- a/grub-configmake/payload/usr/bin/grub-configmake +++ b/grub-configmake/payload/usr/bin/grub-configmake @@ -1,10 +1,23 @@ -#!/bin/sh +#!/bin/sh echo -ne 'Running grub-configmake' -read -p "What is the install root you are using?" install_root -mkdir -p ${install_root}/boot/grub | echo "You probably didn't make /boot" && exit 2 -read -p "What drive do you want to set root to? (Only otherwise it won't work.)" grub_root -read -p "Init binary (full path only)" init_path -cat > ${install_root}/boot/grub/grub.cfg << "EOF" +if [ -z "${init_path}" ] +if [ -z "${grub_root} "] + read -p "What is the install root you are using?" install_root + mkdir -p ${install_root}/boot/grub | echo "You probably didn't make /boot" && exit 2 + read -p "What drive do you want to set root to? (Only otherwise it won't work.)" grub_root + read -p "Init binary (full path only)" init_path + cat > ${install_root}/etc/grub-defaults.cfg << "EOF" + install_root=${install_root} + init_path=${init_path} + grub_root=${grub_root} +EOF +else +else + read -p "What is the install root you are using?" install_root + . ${install_root}/etc/grub-defaults.cfg +fi +fi +cat > ${install_root}/boot/grub/grub.cfg << "EOF" set default=0 set timeout=5 @@ -15,5 +28,5 @@ menuentry "Alnux+Busybox/Linux" { linux /boot/bzImage root=/dev/sda${grub_root} rw init=${init path} rw } EOF -echo "grub-configmake made it's job" +echo "grub-configmake made the config . . ." exit 0 From 50361e88547dd11e6dd993233440601690b6e0b9 Mon Sep 17 00:00:00 2001 From: Ohio2 Date: Mon, 12 Jul 2021 21:01:20 +0200 Subject: [PATCH 07/11] grubcfg remade --- grub-configmake/payload/usr/bin/grub-configmake | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/grub-configmake/payload/usr/bin/grub-configmake b/grub-configmake/payload/usr/bin/grub-configmake index 1e01b29..f9c4409 100644 --- a/grub-configmake/payload/usr/bin/grub-configmake +++ b/grub-configmake/payload/usr/bin/grub-configmake @@ -1,7 +1,8 @@ #!/bin/sh -echo -ne 'Running grub-configmake' -if [ -z "${init_path}" ] -if [ -z "${grub_root} "] +echo 'Running grub-configmake' +read -p "What is the install root you are using?" install_root +defaults=`cat ${install_root}/etc/grub-defaults.cfg 2>/dev/null` +if [ -z "${defaults}" ] read -p "What is the install root you are using?" install_root mkdir -p ${install_root}/boot/grub | echo "You probably didn't make /boot" && exit 2 read -p "What drive do you want to set root to? (Only otherwise it won't work.)" grub_root @@ -12,11 +13,8 @@ if [ -z "${grub_root} "] grub_root=${grub_root} EOF else -else - read -p "What is the install root you are using?" install_root . ${install_root}/etc/grub-defaults.cfg fi -fi cat > ${install_root}/boot/grub/grub.cfg << "EOF" set default=0 set timeout=5 From 12a9cd48b05651759d20ce471d31a0e3015a1ccd Mon Sep 17 00:00:00 2001 From: Ohio2 Date: Mon, 12 Jul 2021 22:34:41 +0200 Subject: [PATCH 08/11] added curses and pthread --- curses-lib/build | 14 ++++++++++++++ curses-lib/package | 5 +++++ pthread/build | 11 +++++++++++ pthread/package | 5 +++++ 4 files changed, 35 insertions(+) create mode 100755 curses-lib/build create mode 100755 curses-lib/package create mode 100644 pthread/build create mode 100755 pthread/package diff --git a/curses-lib/build b/curses-lib/build new file mode 100755 index 0000000..c792d8c --- /dev/null +++ b/curses-lib/build @@ -0,0 +1,14 @@ +wget https://ftp.gnu.org/pub/gnu/ncurses/ncurses-6.2.tar.gz +tar -xf ncurses-6.2.tar.gz +cd ncurses-6.2 +sed -i s/mawk// configure +mkdir build +pushd build +../configure +make -C include +make -C progs tic +popd +./configure --prefix=/usr --build=$(./config.guess) --mandir=/usr/share/man --with-manpage-format=normal --with-shared --without-debug --without-ada --without-normal --enable-widec +make +make install DESTDIR="$1" +echo "INPUT(-lncursesw)" > $1/usr/lib/libncurses.so diff --git a/curses-lib/package b/curses-lib/package new file mode 100755 index 0000000..246cd3d --- /dev/null +++ b/curses-lib/package @@ -0,0 +1,5 @@ +pkg_config_deploy=true +pkg_config_ver="2.6" +pkg_config_name="curses-lib" +pkg_config_makedepends="" +pkg_config_depends="" diff --git a/pthread/build b/pthread/build new file mode 100644 index 0000000..956b992 --- /dev/null +++ b/pthread/build @@ -0,0 +1,11 @@ +wget https://ftp.gnu.org/gnu/pth/pth-2.0.7.tar.gz +tar -xf pth-2.0.7.tar.gz +cd pth-2.0.7.tar.gz +sed -i 's#$(LOBJS): Makefile#$(LOBJS): pth_p.h Makefile#' Makefile.in +./configure --prefix=/usr --disable-static --mandir=/usr/share/man +make +make install && +install -v -m755 -d /usr/share/doc/pth-2.0.7 && +install -v -m644 README PORTING SUPPORT TESTS \ + /usr/share/doc/pth-2.0.7 + diff --git a/pthread/package b/pthread/package new file mode 100755 index 0000000..f7ea00a --- /dev/null +++ b/pthread/package @@ -0,0 +1,5 @@ +pkg_config_deploy=true +pkg_config_ver="2.0.7" +pkg_config_name="pthread" +pkg_config_makedepends="" +pkg_config_depends="" From 2a2e71366a513d40d37bd6b838b03441826843ee Mon Sep 17 00:00:00 2001 From: Ohio2 Date: Mon, 12 Jul 2021 23:10:05 +0200 Subject: [PATCH 09/11] grub-cfgmake modified --- grub-configmake/payload/usr/bin/grub-configmake | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/grub-configmake/payload/usr/bin/grub-configmake b/grub-configmake/payload/usr/bin/grub-configmake index f9c4409..f349f4d 100644 --- a/grub-configmake/payload/usr/bin/grub-configmake +++ b/grub-configmake/payload/usr/bin/grub-configmake @@ -1,12 +1,16 @@ #!/bin/sh echo 'Running grub-configmake' -read -p "What is the install root you are using?" install_root +echo 'What is the install root you are using?' +read install_root defaults=`cat ${install_root}/etc/grub-defaults.cfg 2>/dev/null` if [ -z "${defaults}" ] - read -p "What is the install root you are using?" install_root + echo "What is the install root you are using?" + read install_root mkdir -p ${install_root}/boot/grub | echo "You probably didn't make /boot" && exit 2 - read -p "What drive do you want to set root to? (Only otherwise it won't work.)" grub_root - read -p "Init binary (full path only)" init_path + echo "What drive do you want to set root to? (Only otherwise it won't work.)" + read grub_root + echo "Init binary (full path only)" + read init_path cat > ${install_root}/etc/grub-defaults.cfg << "EOF" install_root=${install_root} init_path=${init_path} From d2745602363cf50759a482b1fb85c6ebb8cc7900 Mon Sep 17 00:00:00 2001 From: Ohio2 Date: Mon, 12 Jul 2021 23:21:30 +0200 Subject: [PATCH 10/11] removed grub-cfgmake --- grub-configmake/package | 6 ---- .../payload/usr/bin/grub-configmake | 34 ------------------- 2 files changed, 40 deletions(-) delete mode 100755 grub-configmake/package delete mode 100644 grub-configmake/payload/usr/bin/grub-configmake diff --git a/grub-configmake/package b/grub-configmake/package deleted file mode 100755 index d94134b..0000000 --- a/grub-configmake/package +++ /dev/null @@ -1,6 +0,0 @@ -#Made By Ohio2 -pkg_config_deploy=true -pkg_config_ver="0.2" -pkg_config_name="grub-configmake" -pkg_config_makedepends="" -pkg_config_depends="" diff --git a/grub-configmake/payload/usr/bin/grub-configmake b/grub-configmake/payload/usr/bin/grub-configmake deleted file mode 100644 index f349f4d..0000000 --- a/grub-configmake/payload/usr/bin/grub-configmake +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/sh -echo 'Running grub-configmake' -echo 'What is the install root you are using?' -read install_root -defaults=`cat ${install_root}/etc/grub-defaults.cfg 2>/dev/null` -if [ -z "${defaults}" ] - echo "What is the install root you are using?" - read install_root - mkdir -p ${install_root}/boot/grub | echo "You probably didn't make /boot" && exit 2 - echo "What drive do you want to set root to? (Only otherwise it won't work.)" - read grub_root - echo "Init binary (full path only)" - read init_path - cat > ${install_root}/etc/grub-defaults.cfg << "EOF" - install_root=${install_root} - init_path=${init_path} - grub_root=${grub_root} -EOF -else - . ${install_root}/etc/grub-defaults.cfg -fi -cat > ${install_root}/boot/grub/grub.cfg << "EOF" -set default=0 -set timeout=5 - -insmod ext2 -set root=(hd0,${root}) - -menuentry "Alnux+Busybox/Linux" { - linux /boot/bzImage root=/dev/sda${grub_root} rw init=${init path} rw -} -EOF -echo "grub-configmake made the config . . ." -exit 0 From 298ad05a0ba432380ab153f283442cd7f6f48818 Mon Sep 17 00:00:00 2001 From: Ohio2 Date: Mon, 12 Jul 2021 23:45:20 +0200 Subject: [PATCH 11/11] restored defconfig --- grub-defconfig/package | 5 +++++ grub-defconfig/payload/boot/grub/grub.cfg | 8 ++++++++ 2 files changed, 13 insertions(+) create mode 100755 grub-defconfig/package create mode 100644 grub-defconfig/payload/boot/grub/grub.cfg diff --git a/grub-defconfig/package b/grub-defconfig/package new file mode 100755 index 0000000..6dae383 --- /dev/null +++ b/grub-defconfig/package @@ -0,0 +1,5 @@ +pkg_config_deploy=true +pkg_config_ver="0.2" +pkg_config_name="grub-defconfig" +pkg_config_makedepends="" +pkg_config_depends="" \ No newline at end of file diff --git a/grub-defconfig/payload/boot/grub/grub.cfg b/grub-defconfig/payload/boot/grub/grub.cfg new file mode 100644 index 0000000..3cc5cf0 --- /dev/null +++ b/grub-defconfig/payload/boot/grub/grub.cfg @@ -0,0 +1,8 @@ +set timeout=15 +set default=0 + +menuentry "Alnux" { + # you will probably want to change the root below... + linux /boot/bzImage noapic root=/dev/sda1 init=/usr/bin/hummingbird + boot +}