From 1fc09da1707a5cec0454a0d413b522eb5cee5bdc Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Tue, 4 Jul 2023 14:54:02 +0200 Subject: [PATCH 1/2] mxstartup: Remove PR mariux64/mxtools#328 imports mxstartup into the mxtools repository. Remove bee-based installation. --- mxstartup.be0 | 86 --------------------------------------------------- 1 file changed, 86 deletions(-) delete mode 100755 mxstartup.be0 diff --git a/mxstartup.be0 b/mxstartup.be0 deleted file mode 100755 index fbafdfde0..000000000 --- a/mxstartup.be0 +++ /dev/null @@ -1,86 +0,0 @@ -#!/usr/bin/env beesh - -# BEE_VERSION mxstartup-2.19-0 - -## this file was created by bee init and should be executed to build a -## bee-package. (Additional hints are located at the end of this file.) - -############################################################################### -## The source URL(s) define the location of the sources that will be -## downloaded. Version variables may be used to simplify reuse of this bee-file. - -#SRCURL[0]="https://github.molgen.mpg.de/mariux64/mxstartup/archive/mxstartup-${PKGVERSION}.tar.gz" -SRCURL[0]="https://beehive.molgen.mpg.de/f1e333dbbed7fa564484758af31d55d7/mxstartup-2.19.tar.gz" - -############################################################################### -## Add URLs/pathes to patch files to the PATCHURL array. -## The sources will be patched in the order of the array. - -# PATCHURL+=() - -############################################################################### -## Add filename patterns to the EXCLUDE array of files that should not -## be added to you package but may be present in the image directory. - -# EXCLUDE+=() - -############################################################################### -## Uncomment the next statement, if the software may not be able to be built -## outside the source directory and needs to be built inside the source -## directory. - -# build_in_sourcedir - -############################################################################### -## bee cannot detect buildtypes specified in subdirectories. -## Sometimes packages "hide" the real sources in a subdirectory named -## 'src' or 'cmake' or .. -## use 'sourcesubdir_append' to specify this directory if known. - -# sourcesubdir_append src - - -############################################################################### -## Change the default (auto-detected) steps to -## extract, patch, configure/setup, build and install the software. -## Make sure the mee_install function does install everything to the -## image directory "${D}" - -#mee_extract() { -# bee_extract "${@}" -#} - -#mee_patch() { -# bee_patch "${@}" -#} - -#mee_configure() { -# bee_configure -#} - -#mee_build() { -# bee_build -#} - -#mee_install() { -# bee_install -#} -## by default this may be 'make install DESTDIR="${D}"' - -############################################################################### -## -## Additional hints: -## -## The name of this bee-file should follow the following naming convention: -## pkgname-pkgversion-pkgrevision.bee -## -## You may remove all comments as long as SRCURL[0] is set. -## -## Everything in this file will be executed in a bash environment. -## -## Build the package by executing -## './pkg-version-N.bee' or -## 'beesh ./pkg-version-N.bee' -## -## see http://beezinga.org/ -## From d83527dc9b2fb79f7db7d178482ef14697e862c5 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Tue, 4 Jul 2023 14:55:54 +0200 Subject: [PATCH 2/2] lightdm: Rebuild to remove lightdm.service PR mariux64/mxtools#328 imports lightdm.service into the mxtools repository. Remove the file from the bee package. --- lightdm.be0 | 26 +------------------------- 1 file changed, 1 insertion(+), 25 deletions(-) diff --git a/lightdm.be0 b/lightdm.be0 index efede3281..0d938a922 100755 --- a/lightdm.be0 +++ b/lightdm.be0 @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -# BEE_VERSION lightdm-1.30.0-2 +# BEE_VERSION lightdm-1.30.0-3 # SRCURL[0]="https://github.com/CanonicalLtd/lightdm/releases/download/${PKGVERSION}/lightdm-${PKGVERSION}.tar.xz" SRCURL[0]="https://beehive.molgen.mpg.de/c566ea595f2b81e68684be9f8dbcbb42/lightdm-1.30.0.tar.xz" @@ -73,28 +73,4 @@ EOF sed -i -e '/^minimum-uid=/ c minimum-uid=100' \ -e '/^hidden-users=/ c hidden-users=nobody nobodyV' \ ${D}/etc/lightdm/users.conf - - - ###################### - # create systemd unit - - mkdir -p ${D}/etc/systemd/system - cat < ${D}/etc/systemd/system/lightdm.service -[Unit] -Description=LightDM -Wants=nvidia.service startup-tags.service -After=systemd-user-sessions.service nvidia.service startup-tags.service -ConditionPathExists=/node/tags/lightdm - -[Service] -ExecStart=/usr/bin/lightdm -Restart=always -BusName=org.freedesktop.DisplayManager -UMask=007 - -[Install] -WantedBy=graphical.target -UNIT - - chmod 644 ${D}/etc/systemd/system/lightdm.service }