From a9a3fa8f01e7fb450e09f467530d5800ec8e9a0f Mon Sep 17 00:00:00 2001
From: KaySar12 <shintheman12@gmail.com>
Date: Thu, 27 Mar 2025 10:35:53 +0700
Subject: [PATCH] update

---
 Makefile         |  4 +++-
 extra-addons     |  2 +-
 setup/package.py | 32 ++++++++++++--------------------
 3 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/Makefile b/Makefile
index 844c4ec91..f13db9556 100644
--- a/Makefile
+++ b/Makefile
@@ -32,7 +32,9 @@ ADDONS=${PWD}/addons,${PWD}/odoo/addons,${PWD}/extra-addons
 BACKUP=${CDN}/raw/branch/main/backup/${VERSION}/odoo18-main_2025-01-15_08-05-47.zip
 
 AUTOMATION_PATH=${PWD}/automation
-
+########### Packaging #########
+package-deb:
+	${PYTHON} ${SETUP_PATH}/package.py --build-deb -b ${PWD}/build
 ########### Automation #########
 deploy-native:
 	@echo "Not implemented"
diff --git a/extra-addons b/extra-addons
index 8a58d6581..1211f8b6c 160000
--- a/extra-addons
+++ b/extra-addons
@@ -1 +1 @@
-Subproject commit 8a58d658101ba060bea44703dff269d451c59522
+Subproject commit 1211f8b6ce4fec0328236badcb2e6d73f38aab87
diff --git a/setup/package.py b/setup/package.py
index df687ce84..d85165447 100755
--- a/setup/package.py
+++ b/setup/package.py
@@ -36,26 +36,18 @@ GPGID = os.getenv("GPGID")
 DOCKERVERSION = VERSION.replace("+", "")
 INSTALL_TIMEOUT = 600
 
-if os.getuid() == 0:
-    DOCKERUSER = """
-    RUN mkdir -p /var/lib/odoo /data && \
-        groupadd -r odoo && \
-        useradd -m -d /var/lib/odoo -s /bin/bash -g odoo odoo && \
-        chown odoo:odoo /var/lib/odoo /data
-    USER odoo
-    """
-else:
-    DOCKERUSER = """
-    RUN mkdir /var/lib/odoo && \
-        groupadd -g %(group_id)s odoo && \
-        useradd -u %(user_id)s -g odoo odoo -d /var/lib/odoo && \
-        mkdir /data && \
-        chown odoo:odoo /var/lib/odoo /data
-    USER odoo
-    """ % {
-        "group_id": os.getgid(),
-        "user_id": os.getuid(),
-    }
+
+DOCKERUSER = """
+RUN mkdir /var/lib/odoo && \
+    groupadd -g %(group_id)s odoo && \
+    useradd -u %(user_id)s -g odoo odoo -d /var/lib/odoo && \
+    mkdir /data && \
+    chown odoo:odoo /var/lib/odoo /data
+USER odoo
+""" % {
+    "group_id": os.getgid() if os.getgid() != 0 else 1000,  # Use 1000 if the group ID is 0 (root)
+    "user_id": os.getuid() if os.getuid() != 0 else 1000,  # Use 1000 if the user ID is 0 (root)
+}
 
 
 class OdooTestTimeoutError(Exception):