diff --git a/.gitignore b/.gitignore index 0b919af2..8afaf8b8 100644 --- a/.gitignore +++ b/.gitignore @@ -5,7 +5,6 @@ /.config.cmd /.config.old /..config.tmp -/.config *.depend *.o /*.patch diff --git a/README.md b/README.md index 0f46113b..ec92e82d 100644 --- a/README.md +++ b/README.md @@ -25,4 +25,4 @@ qemu-system-x86_64 \ -m 1024 \ -net nic -net user ''' -This will allow you to play around with the base system before you build it. We recommend that you save an unmodified/working ISO before modifying ISOs +This will allow you to play around with the base system before you build it. We recommend that you save an unmodified/working ISO before modifying ISOs \ No newline at end of file diff --git a/binary-packages/x86_64/.ADD_YOUR_BINARY_PACKAGES_HERE b/binary-packages/x86_64/.ADD_YOUR_BINARY_PACKAGES_HERE new file mode 100644 index 00000000..e69de29b diff --git a/package/apt/Config.in b/package/apt/Config.in index 7fbf7e1b..3b8279a3 100644 --- a/package/apt/Config.in +++ b/package/apt/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_APT bool "apt" + depends on BR2_PACKAGE_GNUPG_GPGV depends on BR2_PACKAGE_OPENSSL depends on BR2_PACKAGE_XXHASH depends on BR2_PACKAGE_LZ4 diff --git a/package/apt/apt.mk b/package/apt/apt.mk index 2be8f56e..a35d7aae 100644 --- a/package/apt/apt.mk +++ b/package/apt/apt.mk @@ -11,6 +11,17 @@ APT_CONF_OPTS = \ -DUSE_NLS=OFF \ -DBERKELEY_INCLUDE_DIRS=$(STAGING_DIR)/usr/include \ -DBERKELEY_LIBRARIES=$(STAGING_DIR)/usr/lib/libdb.so - +define APT_USERS + _apt -1 _apt -1 * - - - _apt sandbox +endef +define APT_POST_INSTALL_TARGET_HOOK + mkdir -p $(TARGET_DIR)/usr/share/keyrings\ + $(TARGET_DIR)/etc/apt/apt.conf.d $(TARGET_DIR)/apt/authconf.d + $(INSTALL) -D -m 0755 $(PWD)/package/apt/sources.list\ + $(TARGET_DIR)/etc/apt/sources.list + $(INSTALL) -D -m 0755 $(PWD)/package/apt/keyrings/*\ + $(TARGET_DIR)/usr/share/keyrings +endef +APT_POST_INSTALL_TARGET_HOOKS+=APT_POST_INSTALL_TARGET_HOOK $(eval $(cmake-package)) diff --git a/package/apt/keyrings/debian-archive-trixie-automatic.gpg b/package/apt/keyrings/debian-archive-trixie-automatic.gpg new file mode 100644 index 00000000..3320f3dd Binary files /dev/null and b/package/apt/keyrings/debian-archive-trixie-automatic.gpg differ diff --git a/package/apt/keyrings/debian-archive-trixie-security-automatic.gpg b/package/apt/keyrings/debian-archive-trixie-security-automatic.gpg new file mode 100644 index 00000000..ac8c26c2 Binary files /dev/null and b/package/apt/keyrings/debian-archive-trixie-security-automatic.gpg differ diff --git a/package/apt/keyrings/debian-archive-trixie-stable.gpg b/package/apt/keyrings/debian-archive-trixie-stable.gpg new file mode 100644 index 00000000..650c474e Binary files /dev/null and b/package/apt/keyrings/debian-archive-trixie-stable.gpg differ diff --git a/package/apt/sources.list b/package/apt/sources.list new file mode 100644 index 00000000..bbe2baa5 --- /dev/null +++ b/package/apt/sources.list @@ -0,0 +1,9 @@ + +deb [trusted=yes] http://deb.debian.org/debian/ trixie main non-free-firmware +deb-src [trusted=yes] http://deb.debian.org/debian/ trixie main non-free-firmware + +#deb [trusted=yes] http://security.debian.org/debian-security trixie-security main non-free-firmware +#deb-src [trusted=yes] http://security.debian.org/debian-security trixie-security main non-free-firmware + +deb [trusted=yes] http://deb.debian.org/debian/ trixie-updates main non-free-firmware +deb-src [trusted=yes] http://deb.debian.org/debian/ trixie-updates main non-free-firmware diff --git a/package/dpkg/Config.in b/package/dpkg/Config.in index 1a52f6f6..e9964ac3 100644 --- a/package/dpkg/Config.in +++ b/package/dpkg/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_DPKG bool "dpkg" depends on BR2_PACKAGE_GLIBC + depends on BR2_PACKAGE_GLIBC_UTILS select BR2_PACKAGE_TAR select BR2_PACKAGE_LIBSELINUX select BR2_PACKAGE_LIBMD diff --git a/support/scripts/genimage.sh b/support/scripts/genimage.sh index 5cb31ce5..4f3e08d9 100755 --- a/support/scripts/genimage.sh +++ b/support/scripts/genimage.sh @@ -39,7 +39,8 @@ done trap 'rm -rf "${ROOTPATH_TMP}"' EXIT ROOTPATH_TMP="bin/build/buildroot-fs/rootfs.iso9660.tmp" -#cp pkgs/x86_64/enlightenment-x86_64.tar.gz $ROOTPATH_TMP/ +##Uncomment when necessary +#cp -r binary/packages/x86_64/* $ROOTPATH_TMP/ rm -rf "${GENIMAGE_TMP}" genimage \