g/PrawnOS-nonfree
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #3 from SolidHal/mainline-4.9

Browse Source 
move 4.17 kernel changes to correct branch
This commit is contained in:
SolidHal 2018-06-21 20:18:46 -05:00 committed by GitHub
commit 811ebece19
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
buildDebianFs.sh
View File

@ -3,7 +3,7 @@
# Build fs, image # Build fs, image
KVER=4.9.30 KVER=4.17.2
outmnt=$(mktemp -d -p `pwd`) outmnt=$(mktemp -d -p `pwd`)
inmnt=$(mktemp -d -p `pwd`) inmnt=$(mktemp -d -p `pwd`)
@ -58,11 +58,17 @@ create_image debian-stretch-c201-libre-2GB.img $outdev 50M 40 $outmnt
# INCLUDES=apt-utils,libc6,libdebconfclient0,awk,libz2-1.0,libblzma5,libselinux1,tar,libtinfo5,zlib1g,udev,kmod,net-tools,traceroute,iproute2,isc-dhcp-client,wpasupplicant,iw,alsa-utils,cgpt,vim-tiny,less,psmisc,netcat-openbsd,ca-certificates,bzip2,xz-utils,unscd,lightdm,lightdm-gtk-greeter,xfce4,xorg,ifupdown,nano,wicd,wicd-curses # INCLUDES=apt-utils,libc6,libdebconfclient0,awk,libz2-1.0,libblzma5,libselinux1,tar,libtinfo5,zlib1g,udev,kmod,net-tools,traceroute,iproute2,isc-dhcp-client,wpasupplicant,iw,alsa-utils,cgpt,vim-tiny,less,psmisc,netcat-openbsd,ca-certificates,bzip2,xz-utils,unscd,lightdm,lightdm-gtk-greeter,xfce4,xorg,ifupdown,nano,wicd,wicd-curses
# install Debian on it # install Debian on it
qemu-debootstrap --arch=armhf --foreign stretch --variant minbase --include=systemd,systemd-sysv,dbus $outmnt http://deb.debian.org/debian #TODO: Try without the variant and include flags
#TODO: Try without the --foreign flasg as the manpage for debootstrap
#TODO: OR: --foreign
# Do the initial unpack phase of bootstrapping only, for example if the target architecture does not match the host architecture. A copy of debootstrap sufficient for completing the bootstrap process will be installed as /debootstrap/debootstrap in the target filesystem. You can run it with the --second-stage option to complete the bootstrapping process.
qemu-debootstrap --arch armhf --foreign stretch --variant minbase --include=systemd,systemd-sysv,dbus $outmnt http://deb.debian.org/debian
chroot $outmnt passwd -d root chroot $outmnt passwd -d root
#echo -n debsus > $outmnt/etc/hostname #echo -n debsus > $outmnt/etc/hostname
#install -D -m 644 80disable-recommends $outmnt/etc/apt/apt.conf.d/80disable-recommends #install -D -m 644 80disable-recommends $outmnt/etc/apt/apt.conf.d/80disable-recommends
cp -f /etc/resolv.conf $outmnt/etc/ #cp -f /etc/resolv.conf $outmnt/etc/
cp /etc/hosts $outmnt/etc/ #This is what https://wiki.debian.org/EmDebian/CrossDebootstrap suggests
cp sources.list $outmount/etc/apt/sources.list
chroot $outmnt apt update chroot $outmnt apt update
chroot $outmnt apt install -y udev kmod net-tools inetutils-ping traceroute iproute2 isc-dhcp-client wpasupplicant iw alsa-utils cgpt vim-tiny less psmisc netcat-openbsd ca-certificates bzip2 xz-utils unscd ifupdown nano apt-utils python python-urwid chroot $outmnt apt install -y udev kmod net-tools inetutils-ping traceroute iproute2 isc-dhcp-client wpasupplicant iw alsa-utils cgpt vim-tiny less psmisc netcat-openbsd ca-certificates bzip2 xz-utils unscd ifupdown nano apt-utils python python-urwid
chroot $outmnt apt-get autoremove --purge chroot $outmnt apt-get autoremove --purge
@ -70,7 +76,8 @@ chroot $outmnt apt-get clean
chroot $outmnt apt-get install -d -y wicd-daemon wicd wicd-curses chroot $outmnt apt-get install -d -y wicd-daemon wicd wicd-curses
#sed -i s/^[3-6]/\#\&/g $outmnt/etc/inittab #sed -i s/^[3-6]/\#\&/g $outmnt/etc/inittab
#sed -i s/'enable-cache hosts no'/'enable-cache hosts yes'/ -i $outmnt/etc/nscd.conf #sed -i s/'enable-cache hosts no'/'enable-cache hosts yes'/ -i $outmnt/etc/nscd.conf
rm -f $outmnt/etc/resolv.conf #rm -f $outmnt/etc/resolv.conf
rm -rf $outmnt/etc/hosts #This is what https://wiki.debian.org/EmDebian/CrossDebootstrap suggests
# put the kernel in the kernel partition, modules in /lib/modules and AR9271 # put the kernel in the kernel partition, modules in /lib/modules and AR9271
# firmware in /lib/firmware # firmware in /lib/firmware

15
buildKernel.sh
View File

@ -3,7 +3,7 @@
#Build kenerl, wifi firmware #Build kenerl, wifi firmware
KVER=4.9.30 KVER=4.17.2
# build Linux-libre, with ath9k_htc, dwc2 from Chrome OS and without many useless drivers # build Linux-libre, with ath9k_htc, dwc2 from Chrome OS and without many useless drivers
[ ! -f linux-libre-$KVER-gnu.tar.lz ] && wget https://www.linux-libre.fsfla.org/pub/linux-libre/releases/$KVER-gnu/linux-libre-$KVER-gnu.tar.lz [ ! -f linux-libre-$KVER-gnu.tar.lz ] && wget https://www.linux-libre.fsfla.org/pub/linux-libre/releases/$KVER-gnu/linux-libre-$KVER-gnu.tar.lz
@ -11,9 +11,9 @@ KVER=4.9.30
cd linux-$KVER cd linux-$KVER
make clean make clean
make mrproper make mrproper
rm -rf drivers/usb/dwc2 # rm -rf drivers/usb/dwc2
ln -s ../../../chromeos-3.14/drivers/usb/dwc2 drivers/usb/ # ln -s ../../../chromeos-3.14/drivers/usb/dwc2 drivers/usb/
patch -p 1 < ../chromeos-dwc2-glue.patch # patch -p 1 < ../chromeos-dwc2-glue.patch
# reset the minor version number, so out-of-tree drivers continue to work after # reset the minor version number, so out-of-tree drivers continue to work after
# a kernel upgrade # a kernel upgrade
sed s/'SUBLEVEL = .*'/'SUBLEVEL = 0'/ -i Makefile sed s/'SUBLEVEL = .*'/'SUBLEVEL = 0'/ -i Makefile
@ -32,6 +32,13 @@ vbutil_kernel --pack vmlinux.kpart \
--bootloader bootloader.bin --bootloader bootloader.bin
cd .. cd ..
#TODO: Should be able to just include this in /lib/firmware of the target os, and it should be loaded.
# or Should be able to include firmware in kernel through kernel config, external firmware.
# Then the firmware doesn't have to be included in the target fs /lib/firmware
# Either of these should fix the error about the kernel not being able to load the firmware,
# as it is looking for the propriatary blob and stumbles upon this one in /lib/firmware right now
# build AR9271 firmware # build AR9271 firmware
[ ! -d open-ath9k-htc-firmware ] && git clone --depth 1 https://github.com/qca/open-ath9k-htc-firmware.git [ ! -d open-ath9k-htc-firmware ] && git clone --depth 1 https://github.com/qca/open-ath9k-htc-firmware.git
cd open-ath9k-htc-firmware cd open-ath9k-htc-firmware