Skip to content

Commit

Permalink
Changelog:
Browse files Browse the repository at this point in the history
- Update kernels to r132
 - Update iptsd to v3
  • Loading branch information
sebanc committed Nov 17, 2024
1 parent 247c6c5 commit 6a4821e
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 26 deletions.
23 changes: 2 additions & 21 deletions kernel-patches/6.1/base/base.patch
Original file line number Diff line number Diff line change
Expand Up @@ -24751,23 +24751,6 @@ diff -ruN a/fs/ecryptfs/crypto.c b/fs/ecryptfs/crypto.c
if (rc) {
/* metadata is not in the file header, so try xattrs */
memset(page_virt, 0, PAGE_SIZE);
@@ -1973,16 +1977,6 @@
return rc;
}

-static bool is_dot_dotdot(const char *name, size_t name_size)
-{
- if (name_size == 1 && name[0] == '.')
- return true;
- else if (name_size == 2 && name[0] == '.' && name[1] == '.')
- return true;
-
- return false;
-}
-
/**
* ecryptfs_decode_and_decrypt_filename - converts the encoded cipher text name to decoded plaintext
* @plaintext_name: The plaintext name
@@ -2007,21 +2001,13 @@
size_t packet_size;
int rc = 0;
Expand Down Expand Up @@ -29171,18 +29154,16 @@ diff -ruN a/fs/exec.c b/fs/exec.c
#include <trace/events/task.h>
#include "internal.h"

@@ -935,9 +936,12 @@
@@ -935,8 +936,10 @@
if (err)
goto exit;

- if (name->name[0] != '\0')
+ if (name->name[0] != '\0') {
fsnotify_open(file);

+ trace_open_exec(name->name);
+ }
+
out:

return file;

diff -ruN a/fs/ext2/xattr_security.c b/fs/ext2/xattr_security.c
Expand Down
9 changes: 8 additions & 1 deletion kernel-patches/6.6/others/acpi_override_kbd_irq.patch
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ diff --git a/drivers/acpi/resource.c b/drivers/acpi/resource.c
index 85ae394..59423fe 100644
--- a/drivers/acpi/resource.c
+++ b/drivers/acpi/resource.c
@@ -385,62 +385,63 @@ unsigned int acpi_dev_get_irq_type(int triggering, int polarity)
@@ -385,69 +385,70 @@ unsigned int acpi_dev_get_irq_type(int triggering, int polarity)
}
EXPORT_SYMBOL_GPL(acpi_dev_get_irq_type);

Expand Down Expand Up @@ -73,6 +73,13 @@ index 85ae394..59423fe 100644
DMI_MATCH(DMI_BOARD_NAME, "S5602ZA"),
},
},
{
/* Asus Vivobook X1704VAP */
.matches = {
DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
DMI_MATCH(DMI_BOARD_NAME, "X1704VAP"),
},
},
{
- .ident = "Asus ExpertBook B1402CBA",
+ /* Asus ExpertBook B1402CBA */
Expand Down
2 changes: 1 addition & 1 deletion prepare_kernels.sh
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,6 @@ done
rm -rf ./kernels
mkdir ./kernels

chromeos_version="R131"
chromeos_version="R132"
download_and_patch_kernels

7 changes: 4 additions & 3 deletions scripts/build-init
Original file line number Diff line number Diff line change
Expand Up @@ -125,15 +125,16 @@ make install || { echo "Failed to make libfmt"; exit 1; }
cd ../.. || { echo "Failed to make libfmt"; exit 1; }
rm -rf ./fmt || { echo "Failed to make libfmt"; exit 1; }

git clone -b v2 https://github.com/linux-surface/iptsd.git iptsd || { echo "Failed to make iptsd"; exit 1; }
git clone -b v3 https://github.com/linux-surface/iptsd.git iptsd || { echo "Failed to make iptsd"; exit 1; }
cd iptsd || { echo "Failed to make iptsd"; exit 1; }
meson --prefix="/usr" -Dservice_manager="" -Ddebug_tools="" -Dsample_config=false build/ || { echo "Failed to make iptsd"; exit 1; }
sed -i "s@'-Wconversion',@'-Wconversion', '-Wno-pedantic',@g" ./src/meson.build
meson --prefix="/usr" -Dservice_manager="" -Ddebug_tools="" build/ || { echo "Failed to make iptsd"; exit 1; }
DESTDIR=/home/chronos/ipts-pkg ninja -j"$NTHREADS" -C build/ install || { echo "Failed to make iptsd"; exit 1; }
cd .. || { echo "Failed to make iptsd"; exit 1; }
rm -rf ./iptsd || { echo "Failed to make iptsd"; exit 1; }
cd ./ipts-pkg || { echo "Failed to make iptsd"; exit 1; }
mkdir -p ./usr/lib64 || { echo "Failed to make iptsd"; exit 1; }
for i in $(ldd ../ipts-pkg/usr/bin/iptsd | grep "/usr/local/lib" | grep -v ld-linux | cut -d' ' -f3); do if [ ! -f $(echo "$i" | sed "s#/local##g") ] && [ ! -f $(echo "$i" | sed "s#/usr/local##g") ]; then cp "$i" ../ipts-pkg/usr/lib64/ || { echo "Failed to make iptsd"; exit 1; }; fi; done
for i in $(ldd ./usr/bin/iptsd | grep "/usr/local/lib" | grep -v ld-linux | cut -d' ' -f3); do if [ ! -f $(echo "$i" | sed "s#/local##g") ] && [ ! -f $(echo "$i" | sed "s#/usr/local##g") ]; then cp "$i" ./usr/lib64/ || { echo "Failed to make iptsd"; exit 1; }; fi; done
rm -rf ./usr/include ./usr/lib64/pkgconfig ./usr/share/pkgconfig || { echo "Failed to make iptsd"; exit 1; }
tar zcvf ../rootc/packages/ipts.tar.gz * --owner=0 --group=0 || { echo "Failed to make iptsd"; exit 1; }
cd .. || { echo "Failed to make iptsd"; exit 1; }
Expand Down

0 comments on commit 6a4821e

Please sign in to comment.