AGNi-xanmod v1.0 tt (self extracting installer)

psndna88 · Feb 5, 2022 · b759218 · b759218
1 parent 81f96b8
commit b759218
Show file tree

Hide file tree

Showing 7 changed files with 55 additions and 33 deletions.
diff --git a/AGNi_version.sh b/AGNi_version.sh
@@ -4,6 +4,7 @@
 KERNELDIR=`readlink -f .`
 
 export AGNI_VERSION="v1.0"
+export AGNI_KERNEL_LINUX="5.16.5"
 sed -i 's/agni-v1.0/agni-v1.0/' $KERNELDIR/CONFIGS/agni-xanmod/agni*config
 
 echo "	AGNi Version info loaded."

diff --git a/CONFIGS/agni-xanmod/agni_generic_config b/CONFIGS/agni-xanmod/agni_generic_config
@@ -20,14 +20,16 @@ CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
 CONFIG_IRQ_WORK=y
 CONFIG_BUILDTIME_TABLE_SORT=y
 CONFIG_THREAD_INFO_IN_TASK=y
+CONFIG_TT_SCHED=y
+CONFIG_TT_ACCOUNTING_STATS=y
 
 #
 # General setup
 #
 CONFIG_INIT_ENV_ARG_LIMIT=32
 # CONFIG_COMPILE_TEST is not set
 # CONFIG_WERROR is not set
-CONFIG_LOCALVERSION="-xanmod1-agni-v1.0-generic"
+CONFIG_LOCALVERSION="-xanmod1-tt-agni-v1.0-generic"
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_BUILD_SALT=""
 CONFIG_HAVE_KERNEL_GZIP=y
@@ -124,7 +126,6 @@ CONFIG_PREEMPT_VOLUNTARY_BUILD=y
 CONFIG_PREEMPT_VOLUNTARY=y
 # CONFIG_PREEMPT is not set
 # CONFIG_PREEMPT_DYNAMIC is not set
-CONFIG_SCHED_CORE=y
 
 #
 # CPU/Task time and stats accounting
@@ -170,8 +171,7 @@ CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
 #
 # Scheduler features
 #
-CONFIG_UCLAMP_TASK=y
-CONFIG_UCLAMP_BUCKETS_COUNT=5
+# CONFIG_UCLAMP_TASK is not set
 # end of Scheduler features
 
 CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y
@@ -188,11 +188,6 @@ CONFIG_MEMCG_SWAP=y
 CONFIG_MEMCG_KMEM=y
 CONFIG_BLK_CGROUP=y
 CONFIG_CGROUP_WRITEBACK=y
-CONFIG_CGROUP_SCHED=y
-CONFIG_FAIR_GROUP_SCHED=y
-CONFIG_CFS_BANDWIDTH=y
-# CONFIG_RT_GROUP_SCHED is not set
-CONFIG_UCLAMP_TASK_GROUP=y
 CONFIG_CGROUP_PIDS=y
 CONFIG_CGROUP_RDMA=y
 CONFIG_CGROUP_FREEZER=y
@@ -214,8 +209,6 @@ CONFIG_USER_NS=y
 CONFIG_PID_NS=y
 CONFIG_NET_NS=y
 CONFIG_CHECKPOINT_RESTORE=y
-CONFIG_SCHED_AUTOGROUP=y
-CONFIG_SCHED_AUTOGROUP_DEFAULT_ENABLED=y
 # CONFIG_SYSFS_DEPRECATED is not set
 CONFIG_RELAY=y
 CONFIG_BLK_DEV_INITRD=y

diff --git a/CONFIGS/agni-xanmod/agni_zen2_config b/CONFIGS/agni-xanmod/agni_zen2_config
@@ -20,14 +20,16 @@ CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
 CONFIG_IRQ_WORK=y
 CONFIG_BUILDTIME_TABLE_SORT=y
 CONFIG_THREAD_INFO_IN_TASK=y
+CONFIG_TT_SCHED=y
+CONFIG_TT_ACCOUNTING_STATS=y
 
 #
 # General setup
 #
 CONFIG_INIT_ENV_ARG_LIMIT=32
 # CONFIG_COMPILE_TEST is not set
 # CONFIG_WERROR is not set
-CONFIG_LOCALVERSION="-xanmod1-agni-v1.0-ryzen5-zen2"
+CONFIG_LOCALVERSION="-xanmod1-tt-agni-v1.0-amd-zen2"
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_BUILD_SALT=""
 CONFIG_HAVE_KERNEL_GZIP=y
@@ -124,7 +126,6 @@ CONFIG_PREEMPT_VOLUNTARY_BUILD=y
 CONFIG_PREEMPT_VOLUNTARY=y
 # CONFIG_PREEMPT is not set
 # CONFIG_PREEMPT_DYNAMIC is not set
-CONFIG_SCHED_CORE=y
 
 #
 # CPU/Task time and stats accounting
@@ -170,8 +171,7 @@ CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
 #
 # Scheduler features
 #
-CONFIG_UCLAMP_TASK=y
-CONFIG_UCLAMP_BUCKETS_COUNT=5
+# CONFIG_UCLAMP_TASK is not set
 # end of Scheduler features
 
 CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y
@@ -188,11 +188,6 @@ CONFIG_MEMCG_SWAP=y
 CONFIG_MEMCG_KMEM=y
 CONFIG_BLK_CGROUP=y
 CONFIG_CGROUP_WRITEBACK=y
-CONFIG_CGROUP_SCHED=y
-CONFIG_FAIR_GROUP_SCHED=y
-CONFIG_CFS_BANDWIDTH=y
-# CONFIG_RT_GROUP_SCHED is not set
-CONFIG_UCLAMP_TASK_GROUP=y
 CONFIG_CGROUP_PIDS=y
 CONFIG_CGROUP_RDMA=y
 CONFIG_CGROUP_FREEZER=y
@@ -214,8 +209,6 @@ CONFIG_USER_NS=y
 CONFIG_PID_NS=y
 CONFIG_NET_NS=y
 CONFIG_CHECKPOINT_RESTORE=y
-CONFIG_SCHED_AUTOGROUP=y
-CONFIG_SCHED_AUTOGROUP_DEFAULT_ENABLED=y
 # CONFIG_SYSFS_DEPRECATED is not set
 CONFIG_RELAY=y
 CONFIG_BLK_DEV_INITRD=y

diff --git a/Makefile b/Makefile
@@ -416,6 +416,7 @@ endif
 KCONFIG_CONFIG	?= .config
 export KCONFIG_CONFIG
 
+CCACHE := ccache
 # SHELL used by kbuild
 CONFIG_SHELL := sh
 
@@ -424,11 +425,11 @@ HOST_LFS_LDFLAGS := $(shell getconf LFS_LDFLAGS 2>/dev/null)
 HOST_LFS_LIBS := $(shell getconf LFS_LIBS 2>/dev/null)
 
 ifneq ($(LLVM),)
-HOSTCC	= clang
-HOSTCXX	= clang++
+HOSTCC	= $(CCACHE) clang
+HOSTCXX	= $(CCACHE) clang++
 else
-HOSTCC	= gcc
-HOSTCXX	= g++
+HOSTCC	= $(CCACHE) gcc
+HOSTCXX	= $(CCACHE) g++
 endif
 
 export KBUILD_USERCFLAGS := -Wall -Wmissing-prototypes -Wstrict-prototypes \
@@ -443,7 +444,7 @@ KBUILD_HOSTLDLIBS   := $(HOST_LFS_LIBS) $(HOSTLDLIBS)
 # Make variables (CC, etc...)
 CPP		= $(CC) -E
 ifneq ($(LLVM),)
-CC		= clang
+CC		= $(CCACHE) clang
 LD		= ld.lld
 AR		= llvm-ar
 NM		= llvm-nm
@@ -452,7 +453,7 @@ OBJDUMP		= llvm-objdump
 READELF		= llvm-readelf
 STRIP		= llvm-strip
 else
-CC		= $(CROSS_COMPILE)gcc
+CC		= $(CCACHE) $(CROSS_COMPILE)gcc
 LD		= $(CROSS_COMPILE)ld
 AR		= $(CROSS_COMPILE)ar
 NM		= $(CROSS_COMPILE)nm

diff --git a/build_kernel_generic.sh b/build_kernel_generic.sh
@@ -24,7 +24,7 @@ else
 fi;
 
 echo ""
-echo " ~~~~~ Cross-compiling AGNi kernel x86-64 ~~~~~"
+echo " ~~~~~ Cross-compiling AGNi kernel $AGNI_KERNEL_LINUX ~~~~~"
 echo "         VERSION: AGNi $AGNI_VERSION $AGNI_BUILD_TYPE"
 echo ""
 
@@ -39,7 +39,17 @@ fi
 rm $KERNELDIR/.config $KERNELDIR/.config.old 2>/dev/null
 
 if ([ -f $KERNELDIR/../linux-headers*.deb ] && [ -f $KERNELDIR/../linux-image*.deb ] && [ -f $KERNELDIR/../linux-libc*.deb ]); then
-	mv -f $KERNELDIR/../linux*.deb $READY_ZIP/
+	cd $KERNELDIR
+	rm -rf $KERNELDIR/DEB_TEMP 2>/dev/null
+	mkdir $KERNELDIR/DEB_TEMP
+	mv -f $KERNELDIR/../linux*.deb $KERNELDIR/DEB_TEMP/
+	cp -f scripts/package/install_agni.sh $KERNELDIR/DEB_TEMP/
+	chmod +x $KERNELDIR/DEB_TEMP/install_agni.sh
+	makeself --gzip --threads $BUILDJOBS --needroot --nomd5 --nocrc --quiet $KERNELDIR/DEB_TEMP/ AGNi-xanmod-kernel-$AGNI_VERSION-debian-$AGNI_KERNEL_LINUX-$AGNI_BUILD_TYPE.run AGNi_kernel_x86-64 ./install_agni.sh
+	rm -rf $KERNELDIR/DEB_TEMP 2>/dev/null
+	touch $KERNELDIR/AGNi-xanmod-kernel-$AGNI_VERSION-debian-$AGNI_KERNEL_LINUX-$AGNI_BUILD_TYPE.md5
+	echo "`md5sum AGNi-xanmod-kernel*.run`" > $KERNELDIR/AGNi-xanmod-kernel-$AGNI_VERSION-debian-$AGNI_KERNEL_LINUX-$AGNI_BUILD_TYPE.md5
+	mv -f $KERNELDIR/AGNi-xanmod-kernel-$AGNI_VERSION-debian-$AGNI_KERNEL_LINUX-$AGNI_BUILD_TYPE* $READY_ZIP/
 else
 	echo "         ERROR: compiling AGNi kernel $DEVICE."
 fi

diff --git a/build_kernel_zen2.sh b/build_kernel_zen2.sh
@@ -8,7 +8,7 @@ KERNELDIR=`readlink -f .`
 DEVICE="x86"
 CONFIG="agni_zen2_config"
 SYNC_CONFIG=1
-export AGNI_BUILD_TYPE="Ryzen5_zen2_x86-64"
+export AGNI_BUILD_TYPE="amd_zen2_x86-64"
 
 . $KERNELDIR/AGNi_version.sh
 
@@ -24,7 +24,7 @@ else
 fi;
 
 echo ""
-echo " ~~~~~ Cross-compiling AGNi kernel x86-64 ~~~~~"
+echo " ~~~~~ Cross-compiling AGNi kernel $AGNI_KERNEL_LINUX ~~~~~"
 echo "         VERSION: AGNi $AGNI_VERSION $AGNI_BUILD_TYPE"
 echo ""
 
@@ -39,7 +39,17 @@ fi
 rm $KERNELDIR/.config $KERNELDIR/.config.old 2>/dev/null
 
 if ([ -f $KERNELDIR/../linux-headers*.deb ] && [ -f $KERNELDIR/../linux-image*.deb ] && [ -f $KERNELDIR/../linux-libc*.deb ]); then
-	mv -f $KERNELDIR/../linux*.deb $READY_ZIP/
+	cd $KERNELDIR
+	rm -rf $KERNELDIR/DEB_TEMP 2>/dev/null
+	mkdir $KERNELDIR/DEB_TEMP
+	mv -f $KERNELDIR/../linux*.deb $KERNELDIR/DEB_TEMP/
+	cp -f scripts/package/install_agni.sh $KERNELDIR/DEB_TEMP/
+	chmod +x $KERNELDIR/DEB_TEMP/install_agni.sh
+	makeself --gzip --threads $BUILDJOBS --needroot --nomd5 --nocrc --quiet $KERNELDIR/DEB_TEMP/ AGNi-xanmod-kernel-$AGNI_VERSION-debian-$AGNI_KERNEL_LINUX-$AGNI_BUILD_TYPE.run AGNi_kernel_x86-64 ./install_agni.sh
+	rm -rf $KERNELDIR/DEB_TEMP 2>/dev/null
+	touch $KERNELDIR/AGNi-xanmod-kernel-$AGNI_VERSION-debian-$AGNI_KERNEL_LINUX-$AGNI_BUILD_TYPE.md5
+	echo "`md5sum AGNi-xanmod-kernel*.run`" > $KERNELDIR/AGNi-xanmod-kernel-$AGNI_VERSION-debian-$AGNI_KERNEL_LINUX-$AGNI_BUILD_TYPE.md5
+	mv -f $KERNELDIR/AGNi-xanmod-kernel-$AGNI_VERSION-debian-$AGNI_KERNEL_LINUX-$AGNI_BUILD_TYPE* $READY_ZIP/
 else
 	echo "         ERROR: compiling AGNi kernel $DEVICE."
 fi

diff --git a/scripts/package/install_agni.sh b/scripts/package/install_agni.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+EXTRACTDIR=`readlink -f .`
+
+if [ "$UID" -eq 0 ]; then
+	if ([ -f $EXTRACTDIR/linux-headers*.deb ] && [ -f $EXTRACTDIR/linux-image*.deb ] && [ -f $EXTRACTDIR/linux-libc*.deb ]); then
+		echo "Installing AGNi-xanmod kernel...."
+		dpkg -i $EXTRACTDIR/*.deb
+	fi
+else
+	echo "Please attempt to install with superuser/admin rights (sudo/su)"
+fi
+echo ""
+