Răsfoiți Sursa

Adopt linux.install from linux-mainline

Donald Carr 4 ani în urmă
părinte
comite
991bf071b7
3 a modificat fișierele cu 30 adăugiri și 49 ștergeri
  1. 3 12
      PKGBUILD
  2. 27 0
      linux.install
  3. 0 37
      spudd.install

+ 3 - 12
PKGBUILD

@@ -6,7 +6,7 @@ options=('!strip')
 # The firmware the kernel produces blows: don't falsify this lightly
 # "linux-firmware=20170309.695f2d6-1"
 pkgrel=1
-pkgver=5.8.rc7.13.g38d879675ce0
+pkgver=5.7.11.19.g9e539bc574bf
 pkgdesc="Kernel build from head"
 arch=("x86_64" "aarch64" "armv7h")
 license=("GPL2.1")
@@ -24,17 +24,8 @@ pkgname() {
 }
 pkgname
 
-if [ -z "${LOCAL_PI_VER}" ]; then
-    install=spudd.install
-fi
-
 _make_cmd="make ${_xcompile_args}"
 
-prepare() {
-    cp ${startdir}/_spudd.install ${startdir}/spudd.install
-    sed -i "s/spudd/${postfix}/g" ${startdir}/spudd.install
-}
-
 pkgver() {
   cd $_kernel_src_dir
   git describe --tags | sed -e "s/^v//" | tr '-' '.'
@@ -58,7 +49,7 @@ package() {
   preset_dir=${pkgdir}/etc/mkinitcpio.d
 
   cd $_kernel_src_dir
-  INSTALL_MOD_PATH=${usr_dir} ${_make_cmd} modules_install
+  INSTALL_MOD_PATH=${usr_dir} INSTALL_MOD_STRIP=1 ${_make_cmd} modules_install
   if [ -n "${LOCAL_PI_VER}" ]; then
     INSTALL_DTBS_PATH=${dtb_dir} ${_make_cmd} dtbs_install
   fi
@@ -103,7 +94,7 @@ if [ -n "${LOCAL_PI_VER}" ]; then
     esac
 else
     echo "Compiling for desktop"
-    _xcompile_args="CC=clang HOSTCC=clang"
+    #_xcompile_args="CC=clang HOSTCC=clang"
     #_xcompile_args=""
     _config_file="${startdir}/desktop"
     #_config_file="${_kernel_src_dir}/configs/desktop"

+ 27 - 0
linux.install

@@ -0,0 +1,27 @@
+post_install () {
+  # updating module dependencies
+  echo ">>> Updating module dependencies. Please wait ..."
+  depmod %KERNVER%
+}
+
+post_upgrade() {
+  if findmnt --fstab -uno SOURCE /boot &>/dev/null && ! mountpoint -q /boot; then
+    echo "WARNING: /boot appears to be a separate partition but is not mounted."
+  fi
+
+  # updating module dependencies
+  echo ">>> Updating module dependencies. Please wait ..."
+  depmod %KERNVER%
+
+  if [ $(vercmp $2 3.13) -lt 0 ]; then
+    echo ">>> WARNING: AT keyboard support is no longer built into the kernel."
+    echo ">>>          In order to use your keyboard during early init, you MUST"
+    echo ">>>          include the 'keyboard' hook in your mkinitcpio.conf."
+  fi
+}
+
+post_remove() {
+  # also remove the compat symlinks
+  rm -f boot/initramfs-%PKGBASE%.img
+  rm -f boot/initramfs-%PKGBASE%-fallback.img
+}

+ 0 - 37
spudd.install

@@ -1,37 +0,0 @@
-generate_initramfs() {
-    mkinitcpio -p spudd-master
-}
-
-## arg 1:  the new package version
-pre_install() {
-    echo ""
-}
-
-## arg 1:  the new package version
-post_install() {
-    generate_initramfs
-}
-#post_install
-
-## arg 1:  the new package version
-## arg 2:  the old package version
-pre_upgrade() {
-    echo ""
-}
-
-## arg 1:  the new package version
-## arg 2:  the old package version
-post_upgrade() {
-    generate_initramfs
-}
-
-## arg 1:  the old package version
-pre_remove() {
-    echo ""
-}
-#pre_remove
-
-## arg 1:  the old package version
-post_remove() {
-    rm /boot/initramfs-spudd-master*.img
-}