Prechádzať zdrojové kódy

Revert "Adopt linux.install from linux-mainline"

This reverts commit 991bf071b7a6e240dd8559e85849ddbfb6dde0b4.
Donald Carr 4 rokov pred
rodič
commit
bc63f6940f
3 zmenil súbory, kde vykonal 48 pridanie a 29 odobranie
  1. 11 2
      PKGBUILD
  2. 0 27
      linux.install
  3. 37 0
      spudd.install

+ 11 - 2
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.7.11.19.g9e539bc574bf
+pkgver=5.8.rc7.13.g38d879675ce0
 pkgdesc="Kernel build from head"
 arch=("x86_64" "aarch64" "armv7h")
 license=("GPL2.1")
@@ -24,8 +24,17 @@ 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 '-' '.'
@@ -49,7 +58,7 @@ package() {
   preset_dir=${pkgdir}/etc/mkinitcpio.d
 
   cd $_kernel_src_dir
-  INSTALL_MOD_PATH=${usr_dir} INSTALL_MOD_STRIP=1 ${_make_cmd} modules_install
+  INSTALL_MOD_PATH=${usr_dir} ${_make_cmd} modules_install
   if [ -n "${LOCAL_PI_VER}" ]; then
     INSTALL_DTBS_PATH=${dtb_dir} ${_make_cmd} dtbs_install
   fi

+ 0 - 27
linux.install

@@ -1,27 +0,0 @@
-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
-}

+ 37 - 0
spudd.install

@@ -0,0 +1,37 @@
+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
+}